brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [24/50] brooklyn-server git commit: Merge branch 'master' into service-loader-updates
Date Wed, 30 Mar 2016 14:00:01 GMT
Merge branch 'master' into service-loader-updates


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

Branch: refs/heads/master
Commit: b2df8dd2943b63eba805eb1b5209c99b3ade1d3f
Parents: 71d5a10 b8211ed
Author: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Authored: Wed Mar 23 09:48:28 2016 +0000
Committer: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Committed: Wed Mar 23 09:48:28 2016 +0000

----------------------------------------------------------------------
 .../core/location/AbstractLocation.java         |   4 +-
 .../core/location/dynamic/DynamicLocation.java  |  12 +
 .../core/location/dynamic/LocationOwner.java    |   4 -
 .../core/mgmt/persist/XmlMementoSerializer.java |  14 +-
 .../objs/proxy/InternalLocationFactory.java     |  13 ++
 .../brooklyn/util/core/task/BasicTask.java      |  11 +-
 .../core/effector/EffectorBasicTest.java        |  29 +++
 .../core/test/BrooklynMgmtUnitTestSupport.java  |  12 +-
 .../entity/machine/pool/ServerPool.java         |   5 +-
 .../entity/machine/pool/ServerPoolImpl.java     |  53 +++--
 .../entity/machine/pool/ServerPoolLocation.java |  53 ++++-
 .../pool/ServerPoolLocationResolver.java        |  64 +++---
 .../software/base/SoftwareProcessImpl.java      |   2 +-
 ...ClockerDynamicLocationPatternRebindTest.java | 136 +++++++++++
 .../ClockerDynamicLocationPatternTest.java      | 110 +++++++++
 .../dynamic/clocker/StubAttributes.java         |  34 +++
 .../location/dynamic/clocker/StubContainer.java |  33 +++
 .../dynamic/clocker/StubContainerImpl.java      | 131 +++++++++++
 .../dynamic/clocker/StubContainerLocation.java  |  52 +++++
 .../core/location/dynamic/clocker/StubHost.java |  38 ++++
 .../location/dynamic/clocker/StubHostImpl.java  | 141 ++++++++++++
 .../dynamic/clocker/StubHostLocation.java       | 171 ++++++++++++++
 .../dynamic/clocker/StubInfrastructure.java     |  95 ++++++++
 .../dynamic/clocker/StubInfrastructureImpl.java | 224 +++++++++++++++++++
 .../clocker/StubInfrastructureLocation.java     | 139 ++++++++++++
 .../location/dynamic/clocker/StubResolver.java  | 159 +++++++++++++
 .../dynamic/clocker/StubResolverTest.java       |  82 +++++++
 .../location/dynamic/clocker/StubUtils.java     |  95 ++++++++
 .../machine/pool/AbstractServerPoolTest.java    |  23 +-
 .../pool/ServerPoolLocationResolverTest.java    |  65 ++----
 .../entity/machine/pool/ServerPoolTest.java     |   8 +-
 .../usage/ApplicationUsageTrackingTest.java     |  31 +--
 .../org/apache/brooklyn/util/http/HttpTool.java |   3 +-
 33 files changed, 1882 insertions(+), 164 deletions(-)
----------------------------------------------------------------------



Mime
View raw message