You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2015/08/07 19:53:42 UTC

[09/10] incubator-brooklyn git commit: Merge and close #783

Merge and close #783


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

Branch: refs/heads/master
Commit: 7e3b66700c72e8dec0fa184df7fd913df149fbfd
Parents: cc4ffb9 f8cb40c
Author: Richard Downer <ri...@apache.org>
Authored: Fri Aug 7 18:52:24 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Aug 7 18:52:24 2015 +0100

----------------------------------------------------------------------
 .../group/AbstractMembershipTrackingPolicy.java |   3 +-
 .../entity/group/DynamicClusterImpl.java        |  16 +-
 .../brooklyn/location/basic/BasicOsDetails.java |   4 +-
 .../mysql/DynamicToyMySqlEntityBuilder.java     |  17 +-
 software/database/pom.xml                       |   2 +
 .../entity/database/DatastoreMixins.java        |   1 -
 .../entity/database/mysql/MySqlCluster.java     |  68 +++
 .../entity/database/mysql/MySqlClusterImpl.java | 442 +++++++++++++++++++
 .../entity/database/mysql/MySqlNode.java        |  51 +--
 .../entity/database/mysql/MySqlNodeImpl.java    |   5 +-
 .../entity/database/mysql/MySqlRowParser.java   |  39 ++
 .../entity/database/mysql/MySqlSshDriver.java   |  26 +-
 .../entity/database/mysql/mysql_master.conf     |  26 ++
 .../entity/database/mysql/mysql_slave.conf      |  33 ++
 .../entity/database/VogellaExampleAccess.java   |   1 +
 .../mysql/MySqlClusterIntegrationTest.java      |  44 ++
 .../database/mysql/MySqlClusterLiveEc2Test.java |  42 ++
 .../mysql/MySqlClusterLiveSoftlayerTest.java    |  38 ++
 .../database/mysql/MySqlClusterTestHelper.java  | 115 +++++
 .../util/collections/CollectionFunctionals.java |   8 +
 20 files changed, 923 insertions(+), 58 deletions(-)
----------------------------------------------------------------------