diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-03-03 13:58:00 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-03-03 13:58:00 +0400 |
commit | 5212fab963db7ba6698cbd98f8a87ae82e2c1d42 (patch) | |
tree | f89c37c88261200ab279e01cd71638abc4ef434f | |
parent | 2ffc22b563cc707e107d01b7d197605756f0c1a4 (diff) |
1.11-b21.11-b2
-rw-r--r-- | core/Version.php | 2 | ||||
-rw-r--r-- | misc/log-analytics/README.md | 8 | ||||
-rw-r--r-- | misc/others/svn-props-to-set-new-files.svnprops | bin | 78 -> 0 bytes | |||
-rw-r--r-- | tests/README.md | 12 |
4 files changed, 9 insertions, 13 deletions
diff --git a/core/Version.php b/core/Version.php index f31b146659..fa130a0946 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,5 +20,5 @@ final class Piwik_Version * Current Piwik version * @var string */ - const VERSION = '1.11-b1'; + const VERSION = '1.11-b2'; } diff --git a/misc/log-analytics/README.md b/misc/log-analytics/README.md index dc6867f73c..13b8a0ea87 100644 --- a/misc/log-analytics/README.md +++ b/misc/log-analytics/README.md @@ -2,12 +2,8 @@ ## Requirements -* This is currently in BETA TESTING. The parameters name and behavior might change - until the final stable release. Please use with care, expect bugs, and report your - suggestions and advice. * Python 2.6 or 2.7. Python 3.x is not supported. -* Update to Piwik 1.7.2-RC1 or newer - Download Piwik RC from: http://builds.piwik.org/piwik-1.7.2-rc1.zip +* Update to Piwik 1.11 ## How to use this script? @@ -25,8 +21,6 @@ If you wish to track all requests the following command would be used: python /path/to/piwik/misc/log-analytics/import_logs.py --url=http://mysite/piwik/ access.log --idsite=1234 --recorders=4 --enable-http-errors --enable-http-redirects --enable-static --enable-bots -(remember this is a BETA release) - ## How to import your logs automatically every day? You must first make sure your logs are automatically rotated every day. The most diff --git a/misc/others/svn-props-to-set-new-files.svnprops b/misc/others/svn-props-to-set-new-files.svnprops Binary files differdeleted file mode 100644 index ce42602466..0000000000 --- a/misc/others/svn-props-to-set-new-files.svnprops +++ /dev/null diff --git a/tests/README.md b/tests/README.md index bc3982a0d1..3af99f1d45 100644 --- a/tests/README.md +++ b/tests/README.md @@ -43,17 +43,19 @@ it might be that your changes are breaking some features unexpectedly. 2. Configure PHPUnit: Copy the file `piwik/tests/PHPUnit/phpunit.xml.dist` to `phpunit.xml`. In this file, you will find the following lines. - Please edit HTTP_HOST and REQUEST_URI to match the hostname and path of the Piwik files: + Please edit HTTP_HOST and REQUEST_URI to match the hostname and path of the Piwik files. + For example if your Piwik is available at http://localhost/path/to/piwik/ you would write: <server name="HTTP_HOST" value="localhost"/> - <server name="REQUEST_URI" value="/path/to/piwik/tests/all_tests.php"/> - + <server name="REQUEST_URI" value="/path/to/piwik/"/> + + 3. Run the tests (see the next section to run tests in the browser) $ cd /path/to/piwik/tests/PHPUnit $ phpunit - This will run all unit + integration tests. It might take 30 minutes to run. + This will run all unit + integration tests. It might take 10-20 minutes to run. You can also run tests of specified "parts" of Piwik. There are three main groups of tests: Core, Plugins and Integration @@ -124,7 +126,7 @@ work altered the expected images. The standard procedure described in the INTEGR - set up the vagrant piwik vm (which is used by the integration server) or - retrieve the files from the integration server. -## Continous Integration +## Continuous Integration We run a Jenkins server for continuous integration. It automatically downloads the latest version of the Piwik code from our GIT repo and runs a battery of thousands of tests. More information at the links: |