brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [1/4] incubator-brooklyn git commit: Merge remote-tracking branch 'apache/master'
Date Mon, 19 Oct 2015 17:09:23 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 5fda6edf1 -> 57d101817


Merge remote-tracking branch 'apache/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/0398cfa9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0398cfa9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0398cfa9

Branch: refs/heads/master
Commit: 0398cfa9ce04847a902c2433b00e3ded3df27c50
Parents: f380b58 388668a
Author: John McCabe <john@johnmccabe.net>
Authored: Mon Oct 19 13:15:43 2015 +0100
Committer: John McCabe <john@johnmccabe.net>
Committed: Mon Oct 19 13:15:43 2015 +0100

----------------------------------------------------------------------
 .../brooklyn/core/entity/AbstractEntity.java    |   7 +-
 .../apache/brooklyn/core/entity/Entities.java   |  41 ++-
 .../core/entity/factory/ApplicationBuilder.java |   6 +-
 .../core/location/AbstractLocation.java         |  38 ++-
 .../brooklyn/core/mgmt/BrooklynTaskTags.java    |   8 +
 .../core/mgmt/EntityManagementUtils.java        |   2 -
 .../internal/AbstractManagementContext.java     |  13 +-
 .../core/mgmt/internal/LocalEntityManager.java  |   6 +-
 .../brooklyn/enricher/stock/Enrichers.java      |  13 +-
 .../entity/group/AbstractGroupImpl.java         |   1 -
 .../brooklyn/entity/group/DynamicCluster.java   |   4 +
 .../entity/group/DynamicClusterImpl.java        |  30 +-
 .../entity/group/DynamicFabricImpl.java         |   4 +
 .../entity/group/DynamicMultiGroupImpl.java     |   1 -
 .../brooklyn/util/core/task/ValueResolver.java  |  16 +-
 .../entity/AbstractApplicationLegacyTest.java   |  16 +-
 .../brooklyn/core/entity/AttributeMapTest.java  |  14 +-
 .../core/entity/EntityAutomanagedTest.java      | 329 +++++++++++++++++++
 .../core/entity/EntityPreManagementTest.java    | 146 --------
 .../core/entity/hello/LocalEntitiesTest.java    |  15 +-
 .../internal/EntityConfigMapUsageTest.java      |   6 +-
 .../ApplicationBuilderOverridingTest.java       |  15 +-
 .../core/feed/ConfigToAttributesTest.java       |   1 -
 .../brooklyn/core/mgmt/ha/HotStandbyTest.java   |   4 -
 .../internal/LocalSubscriptionManagerTest.java  |   6 -
 .../mgmt/rebind/ActivePartialRebindTest.java    |   3 -
 .../core/mgmt/rebind/CheckpointEntityTest.java  |   1 -
 .../mgmt/rebind/RebindDynamicGroupTest.java     |   1 -
 .../core/test/entity/TestApplicationImpl.java   |   5 +-
 .../stock/CustomAggregatingEnricherTest.java    |  11 +-
 .../stock/EnricherWithDeferredSupplierTest.java | 132 ++++++++
 .../brooklyn/enricher/stock/EnrichersTest.java  |   3 -
 .../entity/group/DynamicClusterTest.java        |  88 ++++-
 .../entity/group/DynamicFabricTest.java         |   4 +-
 .../brooklyn/entity/group/DynamicGroupTest.java |  21 +-
 .../entity/group/DynamicMultiGroupTest.java     |   5 -
 .../group/MembershipTrackingPolicyTest.java     |   1 -
 .../entity/stock/BasicStartableTest.java        |   5 -
 .../feed/ssh/SshFeedIntegrationTest.java        |  11 +-
 docs/guide/ops/locations/index.md               |   4 +-
 .../guide/ops/locations/location-customizers.md | 152 +++++++++
 ...lusterDatabaseExampleAppIntegrationTest.java |   1 -
 .../BalanceableWorkerPoolTest.java              |   1 -
 .../BrooklynNodeUpgradeEffectorBody.java        |   2 +-
 .../BrooklynNodeIntegrationTest.java            |   1 -
 .../entity/brooklynnode/BrooklynNodeTest.java   |  20 +-
 .../entity/java/VanillaJavaAppRebindTest.java   |   4 +-
 .../software/base/SameServerEntityTest.java     |   2 -
 ...ftwareProcessAndChildrenIntegrationTest.java |   1 -
 .../location/WinRmMachineLocationLiveTest.java  |   3 +
 .../messaging/activemq/ActiveMQBrokerImpl.java  |   2 -
 .../messaging/kafka/KafkaClusterImpl.java       |   2 -
 .../entity/messaging/qpid/QpidBrokerImpl.java   |   2 -
 .../messaging/rabbit/RabbitBrokerImpl.java      |   1 -
 .../monitoring/monit/MonitIntegrationTest.java  |  13 +-
 .../network/bind/BindDnsServerLiveTest.java     |   2 -
 .../ControlledDynamicWebAppClusterImpl.java     |   7 +-
 .../entity/proxy/AbstractControllerTest.java    |   2 -
 .../nginx/NginxClusterIntegrationTest.java      |   6 +-
 .../proxy/nginx/NginxRebindIntegrationTest.java |   7 +-
 .../nginx/NginxUrlMappingIntegrationTest.java   |  66 ++--
 .../BrooklynAssemblyTemplateInstantiator.java   |   3 +-
 .../spi/dsl/BrooklynDslDeferredSupplier.java    |  40 ++-
 .../spi/dsl/methods/BrooklynDslCommon.java      |   9 +-
 .../camp/brooklyn/ExternalConfigYamlTest.java   |  54 ++-
 .../brooklyn/launcher/BrooklynLauncher.java     |   4 +
 .../org/apache/brooklyn/qa/load/LoadTest.java   |   5 +-
 .../rest/util/BrooklynRestResourceUtils.java    |  20 +-
 .../brooklyn/rest/domain/ApplicationTest.java   |  16 +-
 .../util/BrooklynRestResourceUtilsTest.java     |  37 ++-
 70 files changed, 1065 insertions(+), 457 deletions(-)
----------------------------------------------------------------------



Mime
View raw message