Merge branch 'develop' into feature/auto_generate_storm_pkg
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/26b4153e Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/26b4153e Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/26b4153e Branch: refs/heads/develop Commit: 26b4153ebf070521fb5030d57846f4ccd7f45cb0 Parents: e1129b0 38c816e Author: Sumit Mohanty <[email protected]> Authored: Wed Sep 3 13:46:44 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Wed Sep 3 13:46:44 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/slider/api/InternalKeys.java | 11 +++++++++++ .../main/java/org/apache/slider/api/ResourceKeys.java | 13 ------------- .../apache/slider/server/appmaster/state/AppState.java | 9 +++++---- 3 files changed, 16 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
