This closes #470
Conflicts:
software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java
- the change in this branch (casting a null to an overloaded method) was
removed in master, so i've removed it here
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e8a70729
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e8a70729
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e8a70729
Branch: refs/heads/master
Commit: e8a707292ace3bcd3b579ecebd363cd1c3cb0543
Parents: 1ae2527 bfb6452
Author: Alex Heneveld <[email protected]>
Authored: Thu Jan 29 17:01:19 2015 +0000
Committer: Alex Heneveld <[email protected]>
Committed: Thu Jan 29 17:01:19 2015 +0000
----------------------------------------------------------------------
core/pom.xml | 16 ++
.../management/ha/BasicMasterChooser.java | 4 +-
locations/jclouds/pom.xml | 16 ++
policy/pom.xml | 16 ++
pom.xml | 23 ++-
sandbox/database/pom.xml | 16 ++
sandbox/nosql/pom.xml | 16 ++
.../lifecycle/StartStopSshDriverTest.groovy | 135 ---------------
.../basic/lifecycle/StartStopSshDriverTest.java | 166 +++++++++++++++++++
.../entity/brooklynnode/BrooklynNodeTest.java | 2 +-
software/database/pom.xml | 14 ++
.../entity/nosql/riak/RiakNodeSshDriver.java | 4 +-
software/webapp/pom.xml | 14 ++
usage/cli/pom.xml | 12 ++
.../src/main/java/brooklyn/cli/ItemLister.java | 4 +-
.../brooklyn/cli/itemlister/ClassFinder.java | 148 -----------------
.../cli/itemlister/ItemDescriptors.java | 158 ------------------
.../java/brooklyn/cli/lister/ClassFinder.java | 148 +++++++++++++++++
.../brooklyn/cli/lister/ItemDescriptors.java | 158 ++++++++++++++++++
usage/test-support/pom.xml | 11 ++
utils/groovy/pom.xml | 13 +-
21 files changed, 645 insertions(+), 449 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e8a70729/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e8a70729/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
----------------------------------------------------------------------
