This closes #224
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f7d8691c Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f7d8691c Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f7d8691c Branch: refs/heads/master Commit: f7d8691c43b44e2a24a102ed96d1a33bb44523a0 Parents: 9acf9a4 542d992 Author: Aled Sage <aled.s...@gmail.com> Authored: Wed Oct 8 23:45:28 2014 +0100 Committer: Aled Sage <aled.s...@gmail.com> Committed: Wed Oct 8 23:45:28 2014 +0100 ---------------------------------------------------------------------- .../location/basic/SshMachineLocation.java | 34 ++++++----- .../location/basic/SshMachineLocationTest.java | 13 +++- .../jclouds/JcloudsSshMachineLocation.java | 4 +- .../BrooklynComponentTemplateResolver.java | 2 +- .../spi/creation/BrooklynEntityMatcher.java | 2 +- .../camp/brooklyn/EntitiesYamlTest.java | 23 +++++++ .../qa/load/SimulatedJBoss7ServerImpl.java | 64 +++++++++++++++++++- .../qa/load/SimulatedMySqlNodeImpl.java | 20 +++++- .../qa/load/SimulatedNginxControllerImpl.java | 21 ++++++- .../brooklyn/qa/load/SimulatedTheeTierApp.java | 4 ++ .../test/java/brooklyn/qa/load/LoadTest.java | 2 + 11 files changed, 163 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
