Merging from develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/49f633e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/49f633e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/49f633e3 Branch: refs/heads/feature/SLIDER-285_Restart_AM Commit: 49f633e31cfcc30e35b85e3ccfb17db584970fd7 Parents: 159fbe5 49e2881 Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Tue Aug 12 13:45:14 2014 -0700 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Tue Aug 12 13:45:14 2014 -0700 ---------------------------------------------------------------------- slider-agent/src/main/python/agent/Registry.py | 1 + .../server/appmaster/actions/ActionHalt.java | 9 +- .../appmaster/actions/ActionStartContainer.java | 6 +- .../appmaster/actions/ActionStopQueue.java | 9 +- .../appmaster/actions/ActionStopSlider.java | 2 +- .../server/appmaster/actions/AsyncAction.java | 55 ++++++++-- .../actions/ProviderReportedContainerLoss.java | 2 +- .../actions/ProviderStartupCompleted.java | 2 +- .../server/appmaster/actions/QueueAccess.java | 3 + .../server/appmaster/actions/QueueExecutor.java | 2 +- .../appmaster/actions/RenewingAction.java | 105 +++++++++++++++++++ .../appmaster/actions/StartContainerAction.java | 41 -------- .../slider/server/appmaster/state/AppState.java | 2 + .../server/appmaster/actions/TestActions.groovy | 37 ++++++- 14 files changed, 211 insertions(+), 65 deletions(-) ----------------------------------------------------------------------
