This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 2beae0df73f1929786578e135fcdcb123d33f94f Merge: 5df761c 57e7b1a Author: Juan Cabrerizo <[email protected]> AuthorDate: Mon Nov 26 11:37:48 2018 +0000 Merge branch 'master' of https://github.com/apache/brooklyn-server .../apache/brooklyn/api/catalog/CatalogItem.java | 3 +- .../brooklyn/api/objs/BrooklynObjectType.java | 3 +- core/pom.xml | 4 +- .../brooklyn/core/catalog/CatalogPredicates.java | 4 +- .../catalog/internal/BasicBrooklynCatalog.java | 6 ++- .../internal/CatalogApplicationItemDto.java | 42 ++++++++++++++++ .../core/catalog/internal/CatalogItemBuilder.java | 7 +++ .../enricher/stock/aggregator/AggregationJob.java | 2 +- .../core/plan/XmlPlanToSpecTransformer.java | 2 +- .../brooklyn/util/core/osgi/OsgiTestBase.java | 19 +++----- .../util/core/ssh/BashCommandsIntegrationTest.java | 21 ++++++++ parent/pom.xml | 1 + .../policy/failover/PropagatePrimaryEnricher.java | 3 +- .../rest/resources/ApplicationResource.java | 6 ++- .../rest/transform/CatalogTransformer.java | 2 + .../brooklyn/rest/transform/TypeTransformer.java | 7 ++- .../java/org/apache/brooklyn/cli/ItemLister.java | 2 +- .../org/apache/brooklyn/test/DisableOnWindows.java | 40 +++++++++++++++ .../brooklyn/test/DisableOnWindowsListener.java | 57 ++++++++++++++++++++++ .../META-INF/services/org.testng.ITestNGListener | 1 + .../apache/brooklyn/test/DisableOnWindowsTest.java | 41 ++++++++++++++++ .../java/org/apache/brooklyn/util/io/FileUtil.java | 17 +++++++ .../rt/felix/EmbeddedFelixFrameworkTest.java | 14 ++---- 23 files changed, 270 insertions(+), 34 deletions(-)
