brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [2/4] incubator-brooklyn git commit: Merge remote-tracking branch 'upstream/master'
Date Thu, 17 Dec 2015 11:58:28 GMT
Merge remote-tracking branch 'upstream/master'


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/40a41336
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/40a41336
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/40a41336

Branch: refs/heads/master
Commit: 40a413369444b63901a4003fd3189ffaafc7ae06
Parents: 0a86e29 4ed9e97
Author: Murdo Aird <murdo.aird@gmail.com>
Authored: Fri Dec 11 22:20:32 2015 +0000
Committer: Murdo Aird <murdo.aird@gmail.com>
Committed: Fri Dec 11 22:20:32 2015 +0000

----------------------------------------------------------------------
 .../yaml/test/example_yaml/entities/script1.sh  |  2 +
 .../entities/simpleshellcommandtest-entity.yaml | 24 +++++++
 docs/guide/yaml/test/index.md                   |  1 +
 docs/guide/yaml/test/test-entities.md           | 68 ++++++++++++++++----
 docs/website/download/index.md                  |  8 +--
 .../entity/database/mysql/MySqlNode.java        |  2 +-
 .../entity/database/mysql/MySqlNodeImpl.java    |  4 +-
 .../entity/database/mysql/MySqlSshDriver.java   | 14 ++--
 .../entity/nosql/redis/RedisStoreSshDriver.java | 10 ++-
 usage/rest-api/pom.xml                          | 46 ++++++++++++-
 .../InfrastructureDeploymentTestCase.java       | 54 ++++++++++++++++
 .../InfrastructureDeploymentTestCaseImpl.java   | 57 ++++++++++++++++
 .../brooklyn/test/framework/TestCase.java       |  4 +-
 .../brooklyn/test/framework/TestCaseImpl.java   | 19 ++++--
 14 files changed, 280 insertions(+), 33 deletions(-)
----------------------------------------------------------------------



Mime
View raw message