diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-11-04 11:32:51 +0300 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-11-04 11:32:51 +0300 |
commit | 0b7aa3d9c0be54fc59c14edb4dd35deea503dbe6 (patch) | |
tree | c46d49b16c2bfef1a93c35ce6337a563dd93b003 | |
parent | 4752a708c60a37020b615f5b3767633c75d7fab8 (diff) | |
parent | d85d32db0940334ff3320787058c0b501f19bd66 (diff) |
Merge remote-tracking branch 'origin/master'2.9.0-b4
-rw-r--r-- | core/Version.php | 2 | ||||
-rw-r--r-- | plugins/TestRunner/README.md | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/core/Version.php b/core/Version.php index a924b46bc7..af6db311ed 100644 --- a/core/Version.php +++ b/core/Version.php @@ -21,5 +21,5 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '2.9.0-b3'; + const VERSION = '2.9.0-b4'; } diff --git a/plugins/TestRunner/README.md b/plugins/TestRunner/README.md index 822b05dbba..be10873613 100644 --- a/plugins/TestRunner/README.md +++ b/plugins/TestRunner/README.md @@ -48,4 +48,17 @@ __How can I change the base image (AMI) that is used for AWS tests?__ * Once everything works remove the outdated AMI by selecting it and clicking `Actions => Deregister`. In the future once everything is completely automated we would simple create a new instance out of ((Vagrant || Docker) && Puppet) whenever we need a change but it takes a lot of time to do this and is not worth it right now. -
\ No newline at end of file + +__How do I create a new EC2 key/pair for a developer?__ + +1. Go to: https://console.aws.amazon.com/ec2/v2/home?region=us-east-1 +2. Click `Create Key Pair` +3. Send PGP email +``` +Here are info for running tests on Ec2 + * Access Key ID: + * Secret Access Key: + * aws_keyname = "piwik-xyz" + * PEM file content is: +``` + |