[3/4] brooklyn-server git commit: Merge remote-tracking branch 'upstream/master'

2018-09-12 Thread duncangrant 
Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/master
Commit: d517935858187aa7a288b9678a80eec355d56f27
Parents: d350453 f6ad118
Author: Duncan Grant 
Authored: Wed Sep 12 15:24:50 2018 +0100
Committer: Duncan Grant 
Committed: Wed Sep 12 15:24:50 2018 +0100

--
 .../spi/dsl/BrooklynDslDeferredSupplier.java|   3 +-
 .../brooklyn/spi/dsl/methods/DslComponent.java  |  12 +-
 .../camp/brooklyn/spi/dsl/DslYamlTest.java  |  61 +++
 .../brooklyn/core/entity/AbstractEntity.java|   2 +-
 .../mgmt/internal/EntityManagerInternal.java|   8 +
 .../core/mgmt/internal/LocalEntityManager.java  |  43 +
 .../internal/NonDeploymentEntityManager.java|   6 +-
 .../core/objs/AbstractEntityAdjunct.java|   2 +
 .../core/objs/proxy/InternalEntityFactory.java  |  15 +-
 .../brooklyn/core/policy/AbstractPolicy.java|   4 +-
 .../core/entity/proxying/EntityManagerTest.java |  27 
 .../brooklyn/core/mgmt/DeployFailureTest.java   | 162 +++
 .../autoscaling/AutoScalerPolicyRebindTest.java |   3 +-
 13 files changed, 333 insertions(+), 15 deletions(-)
--

[4/4] brooklyn-server git commit: Closes #990

2018-09-12 Thread duncangrant 
Closes #990

Revert "This closes #988"

This reverts commit f6ad11846de2d9ba2e9004648179270e3ca3c25f, reversing
changes made to c782aae54f424e317c0999f5cde3fab19bc45cfb.

This PR broke 
`DynamicClusterWithAvailabilityZonesRebindTest.testRebindWithCustomZoneFailureDetector`,
 because it caused the feed to be persisted (which should not have been).

I created this revert by running:
```
git revert f6ad11846d -m 1
```


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

Branch: refs/heads/master
Commit: b141425c8e2da58cc78c2443997edc485f2869e7
Parents: d517935 fc5abc7
Author: Duncan Grant 
Authored: Wed Sep 12 15:25:50 2018 +0100
Committer: Duncan Grant 
Committed: Wed Sep 12 15:25:50 2018 +0100

--
 .../org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java | 2 --
 .../java/org/apache/brooklyn/core/policy/AbstractPolicy.java | 4 +++-
 .../brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java  | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)
--

[1/4] brooklyn-server git commit: Closes #984

2018-09-12 Thread duncangrant 
Repository: brooklyn-server
Updated Branches:
  refs/heads/master f6ad11846 -> b141425c8


Closes #984

restore the field `subType` for sub-element config keys

now supports generics _or_ plain, so persistence is simpler when plain,
(as done for BasicConfigKey)


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

Branch: refs/heads/master
Commit: d35045348c188d9a275276931436a430f8856367
Parents: 936ce61 26d1d44
Author: Duncan Grant 
Authored: Wed Sep 5 11:54:17 2018 +0100
Committer: Duncan Grant 
Committed: Wed Sep 5 11:54:17 2018 +0100

--
 .../brooklyn/core/config/ListConfigKey.java |  2 +-
 .../brooklyn/core/config/MapConfigKey.java  |  2 +-
 .../brooklyn/core/config/SetConfigKey.java  |  2 +-
 .../internal/AbstractCollectionConfigKey.java   |  2 +-
 .../internal/AbstractStructuredConfigKey.java   | 27 
 5 files changed, 26 insertions(+), 9 deletions(-)
--

svn commit: r29323 - /dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/

2018-09-12 Thread richard 
Author: richard
Date: Wed Sep 12 10:15:11 2018
New Revision: 29323

Log:
Add apache-brooklyn-1.0.0-M1-rc1 to dist/dev/brooklyn

Added:
dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-bin.tar.gz
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-bin.tar.gz.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-bin.tar.gz.sha256

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-bin.zip  
 (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-bin.zip.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-bin.zip.sha256

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-linux.tar.gz
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-linux.tar.gz.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-linux.tar.gz.sha256

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-linux.zip
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-linux.zip.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-linux.zip.sha256

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-macosx.tar.gz
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-macosx.tar.gz.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-macosx.tar.gz.sha256

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-macosx.zip
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-macosx.zip.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-macosx.zip.sha256

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-windows.tar.gz
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-windows.tar.gz.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-windows.tar.gz.sha256

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-windows.zip
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-windows.zip.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-client-cli-windows.zip.sha256

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-src.tar.gz
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-src.tar.gz.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-src.tar.gz.sha256

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-src.zip  
 (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-src.zip.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-src.zip.sha256

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-vagrant.tar.gz
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-vagrant.tar.gz.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-vagrant.tar.gz.sha256

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-vagrant.zip
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-vagrant.zip.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-vagrant.zip.sha256
dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1.deb  
 (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1.deb.asc  
 (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1.deb.sha256

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1_1.noarch.rpm
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1_1.noarch.rpm.asc
   (with props)

dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1_1.noarch.rpm.sha256

Added: 
dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-bin.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/brooklyn/apache-brooklyn-1.0.0-M1-rc1/apache-brooklyn-1.0.0-M1-rc1-bin.tar.gz

[brooklyn-server] Git Push Summary

2018-09-12 Thread richard 
Repository: brooklyn-server
Updated Tags:  refs/tags/rel/apache-brooklyn-1.0.0-M1-rc1 [created] 31dd157ce

[brooklyn] Git Push Summary

2018-09-12 Thread richard 
Repository: brooklyn
Updated Tags:  refs/tags/rel/apache-brooklyn-1.0.0-M1-rc1 [created] adba43632

[brooklyn-ui] Git Push Summary

2018-09-12 Thread richard 
Repository: brooklyn-ui
Updated Tags:  refs/tags/rel/apache-brooklyn-1.0.0-M1-rc1 [created] 2ad4a1ffc

[brooklyn-library] Git Push Summary

2018-09-12 Thread richard 
Repository: brooklyn-library
Updated Tags:  refs/tags/rel/apache-brooklyn-1.0.0-M1-rc1 [created] ae39cb1e7

[brooklyn-client] Git Push Summary

2018-09-12 Thread richard 
Repository: brooklyn-client
Updated Tags:  refs/tags/rel/apache-brooklyn-1.0.0-M1-rc1 [created] 9dc397b86

[brooklyn-docs] Git Push Summary

2018-09-12 Thread richard 
Repository: brooklyn-docs
Updated Tags:  refs/tags/rel/apache-brooklyn-1.0.0-M1-rc1 [created] 8fd7edadc

[brooklyn-dist] Git Push Summary

2018-09-12 Thread richard 
Repository: brooklyn-dist
Updated Tags:  refs/tags/rel/apache-brooklyn-1.0.0-M1-rc1 [created] 07c2b233e