Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Conflicts:
slider-core/src/main/java/org/apache/slider/client/SliderClient.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/de41cb5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/de41cb5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/de41cb5b
Branch: refs/heads/develop
Commit: de41cb5bd49ce8ed0c2ffdf345d0ae9608236735
Parents: 315a895 2037ac4
Author: Gour Saha <[email protected]>
Authored: Fri Feb 27 18:21:02 2015 -0800
Committer: Gour Saha <[email protected]>
Committed: Fri Feb 27 18:21:02 2015 -0800
----------------------------------------------------------------------
app-packages/hbase-win/pom.xml | 3 +-
app-packages/hbase/pom.xml | 3 +-
app-packages/storm-win/pom.xml | 2 +
app-packages/storm/pom.xml | 2 +
pom.xml | 9 +-
slider-agent/src/main/python/agent/main.py | 9 +-
slider-agent/src/main/python/agent/security.py | 10 +-
slider-assembly/pom.xml | 2 +-
.../apache/slider/api/SliderApplicationApi.java | 9 +
.../slider/api/SliderClusterProtocol.java | 2 +-
.../org/apache/slider/client/SliderClient.java | 234 ++++++++++---------
.../client/ipc/SliderApplicationIpcClient.java | 12 +
.../client/ipc/SliderClusterOperations.java | 27 ++-
.../slider/client/rest/BaseRestClient.java | 4 +-
.../rest/SliderApplicationApiRestClient.java | 60 ++++-
.../apache/slider/common/SliderXmlConfKeys.java | 3 +-
.../common/params/AbstractActionArgs.java | 4 +-
.../apache/slider/common/params/CommonArgs.java | 2 +-
.../apache/slider/common/tools/SliderUtils.java | 3 +-
.../core/exceptions/ExceptionConverter.java | 39 +++-
.../core/registry/retrieve/AMWebClient.java | 5 -
.../registry/retrieve/RegistryRetriever.java | 8 +-
.../slider/providers/agent/AgentKeys.java | 3 +-
.../providers/agent/AgentProviderService.java | 8 +-
.../server/appmaster/SliderAppMaster.java | 6 +-
.../rpc/SliderClusterProtocolProxy.java | 5 +-
.../server/appmaster/rpc/SliderIPCService.java | 2 +-
.../slider/server/appmaster/state/AppState.java | 36 ++-
.../appmaster/web/rest/InsecureAmFilter.java | 2 +-
.../rest/application/ApplicationResource.java | 80 ++++++-
.../services/security/CertificateManager.java | 46 +++-
.../server/services/security/SecurityUtils.java | 41 +---
.../rest/AbstractAppApiTestDelegates.groovy | 49 ++++
.../agent/rest/LowLevelRestTestDelegates.groovy | 92 +++++++-
.../rest/RestAPIClientTestDelegates.groovy | 21 +-
.../slider/client/TestCommonArgParsing.groovy | 40 +++-
.../TestMockAppStateFlexDynamicRoles.groovy | 8 +-
.../TestMockAppStateRebuildOnAMRestart.groovy | 5 +-
.../view/TestClusterSpecificationBlock.groovy | 2 +-
.../web/view/TestContainerStatsBlock.groovy | 26 ++-
.../appmaster/web/view/TestIndexBlock.groovy | 2 +-
.../org/apache/slider/test/KeysForTests.groovy | 2 +
.../apache/slider/test/SliderTestUtils.groovy | 17 +-
.../security/TestCertificateManager.java | 40 ++--
.../slider/tools/TestJavaLanguageVersion.java | 42 ++++
.../funtest/framework/CommandTestBase.groovy | 21 +-
.../funtest/framework/FileUploader.groovy | 6 +-
.../funtest/lifecycle/AppsThroughAgentIT.groovy | 10 +-
48 files changed, 767 insertions(+), 297 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/de41cb5b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --cc slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index ed343d2,762ac10..dfa7cd6
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@@ -2152,11 -2184,8 +2192,11 @@@ public class SliderClient extends Abstr
}
// create a new map with only that instance in it.
// this restricts the output of results to this instance
- persistentInstances = new HashMap<String, Path>();
+ persistentInstances = new HashMap<>();
- persistentInstances.put(clustername, persistent);
+ persistentInstances.put(clustername, persistent);
+ if (listContainers) {
+ containers = getContainers(clustername);
+ }
}
// at this point there is either the entire list or a stripped down
instance
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/de41cb5b/slider-core/src/main/java/org/apache/slider/client/ipc/SliderClusterOperations.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/de41cb5b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
----------------------------------------------------------------------
