You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/12/01 16:57:37 UTC
[4/7] incubator-brooklyn git commit: Merge remote-tracking branch
'upstream/master'
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/d9326e76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d9326e76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d9326e76
Branch: refs/heads/master
Commit: d9326e7694fdbd662d5eb6b2d383fa725f1e376b
Parents: 862e8d2 dea4a51
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Fri Nov 28 21:04:22 2014 -0500
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Fri Nov 28 21:04:22 2014 -0500
----------------------------------------------------------------------
.../brooklyn/management/ManagementContext.java | 5 +-
.../location/access/PortForwardManager.java | 242 ++++++++---
.../access/PortForwardManagerAuthority.java | 230 +---------
.../access/PortForwardManagerClient.java | 272 +++++++++++-
.../location/access/PortForwardManagerImpl.java | 430 +++++++++++++++++++
.../PortForwardManagerLocationResolver.java | 89 ++++
.../brooklyn/location/access/PortMapping.java | 38 +-
.../basic/AbstractLocationResolver.java | 2 +-
.../internal/AbstractManagementContext.java | 2 +-
.../NonDeploymentManagementContext.java | 1 -
.../services/brooklyn.location.LocationResolver | 1 +
.../PortForwardManagerLocationResolverTest.java | 83 ++++
.../access/PortForwardManagerRebindTest.java | 63 ++-
.../location/access/PortForwardManagerTest.java | 157 +++++++
docs/dev/build/debugging-remote-brooklyn.md | 140 ++++++
docs/dev/code/index.include.md | 1 +
.../location/jclouds/JcloudsLocation.java | 15 +-
.../JcloudsPortForwarderExtension.java | 11 +
.../java/brooklyn/entity/java/JmxSupport.java | 7 +-
19 files changed, 1442 insertions(+), 347 deletions(-)
----------------------------------------------------------------------