Merge pull request #996 from ahgittin/misc more useful sample "brooklyn.properties" plus very minor code/javadoc tidies
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/34124877 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/34124877 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/34124877 Branch: refs/heads/0.6.0 Commit: 3412487784476a38202824072837c99492204541 Parents: 358c13e 12b1678 Author: Aled Sage <[email protected]> Authored: Tue Nov 5 06:38:50 2013 -0800 Committer: Aled Sage <[email protected]> Committed: Tue Nov 5 06:38:50 2013 -0800 ---------------------------------------------------------------------- api/src/main/java/brooklyn/location/LocationRegistry.java | 2 ++ .../src/main/java/brooklyn/event/feed/function/FunctionFeed.java | 4 ++++ .../java/brooklyn/location/jclouds/JcloudsLocationConfig.java | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
