Merge branch 'master' into config-immediate-more
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1744145b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1744145b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1744145b Branch: refs/heads/master Commit: 1744145b6091158bf64dda92831e88fe0cc9cc32 Parents: ccc8048 2fe2ba0 Author: Alex Heneveld <[email protected]> Authored: Tue Mar 7 12:13:58 2017 +0000 Committer: Alex Heneveld <[email protected]> Committed: Tue Mar 7 12:13:58 2017 +0000 ---------------------------------------------------------------------- .../brooklyn/core/entity/EntityConfigTest.java | 60 +++++++++++++++++++- .../org/apache/brooklyn/rest/api/LogoutApi.java | 7 +++ .../brooklyn/rest/resources/LogoutResource.java | 7 +++ .../resources/OSGI-INF/blueprint/service.xml | 1 + 4 files changed, 74 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1744145b/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java ----------------------------------------------------------------------
