Merge branch 'master' into simplecommand
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a0461971 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a0461971 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a0461971 Branch: refs/heads/master Commit: a0461971c3330958cf27fbc149f2a4b02a9fb326 Parents: 4a37d07 cf4d77b Author: Geoff Macartney <geoff.macart...@cloudsoftcorp.com> Authored: Mon Nov 23 17:12:22 2015 +0000 Committer: Geoff Macartney <geoff.macart...@cloudsoftcorp.com> Committed: Mon Nov 23 17:12:22 2015 +0000 ---------------------------------------------------------------------- .../org/apache/brooklyn/core/internal/BrooklynProperties.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ----------------------------------------------------------------------
