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 2014/07/08 19:00:41 UTC
[5/5] git commit: Merge and close PR #52
Merge and close PR #52
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/35dce9b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/35dce9b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/35dce9b9
Branch: refs/heads/master
Commit: 35dce9b92bc92d3221c2142f73b6ab8d04132e5e
Parents: 73dcb1d 0cff1f2
Author: Richard Downer <ri...@apache.org>
Authored: Tue Jul 8 18:00:13 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Jul 8 18:00:13 2014 +0100
----------------------------------------------------------------------
.../internal/BrooklynFeatureEnablement.java | 8 ++
.../location/basic/BasicMachineDetails.java | 10 +-
.../location/basic/SshMachineLocationTest.java | 109 ++++++++++++++++++-
.../util/internal/ssh/RecordingSshTool.java | 76 +++++++++++++
.../location/jclouds/JcloudsLocation.java | 7 +-
.../jclouds/JcloudsSshMachineLocation.java | 14 ++-
.../java/brooklyn/entity/java/JavaOptsTest.java | 71 +-----------
.../src/main/java/brooklyn/test/Asserts.java | 45 ++++++++
.../test/java/brooklyn/test/AssertsTest.java | 58 ++++++++++
9 files changed, 313 insertions(+), 85 deletions(-)
----------------------------------------------------------------------