This closes #569 * github/pr/569: Suppress warnings about serialVersionUid Make ConfigInheritance classes serializable Change back to ConfigKey with inheritance disabled Set the CAMP planId as an attribute so that it is not inherited
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9ef37b2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9ef37b2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9ef37b2c Branch: refs/heads/master Commit: 9ef37b2c92e6130331c1173fcc6a0a430331b9c0 Parents: 1caede4 afcc7ad Author: Andrew Kennedy <[email protected]> Authored: Tue Mar 24 19:57:03 2015 +0000 Committer: Andrew Kennedy <[email protected]> Committed: Tue Mar 24 19:57:03 2015 +0000 ---------------------------------------------------------------------- .../camp/brooklyn/BrooklynCampConstants.java | 29 +++++++++++--------- .../BrooklynComponentTemplateResolver.java | 4 +-- .../java/brooklyn/config/ConfigInheritance.java | 5 +++- 3 files changed, 22 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
