Merge branch 'develop' into feature/SLIDER-799-AM-managed-relax
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7141d931 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7141d931 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7141d931 Branch: refs/heads/feature/SLIDER-799-AM-managed-relax Commit: 7141d931b3a48111f97ad9bbff0018e087ff2979 Parents: b2b8750 909b7c1 Author: Steve Loughran <[email protected]> Authored: Tue Mar 3 16:01:49 2015 -0800 Committer: Steve Loughran <[email protected]> Committed: Tue Mar 3 16:01:49 2015 -0800 ---------------------------------------------------------------------- ...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 2 +- ...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 2 +- app-packages/storm/package/scripts/params.py | 1 + .../storm/package/templates/config.yaml.j2 | 2 +- .../slider/api/proto/RestTypeMarshalling.java | 14 ++- .../org/apache/slider/client/SliderClient.java | 27 +++- .../client/ipc/SliderClusterOperations.java | 8 +- .../slider/common/params/ActionListArgs.java | 4 + .../apache/slider/common/params/Arguments.java | 1 + .../apache/slider/common/tools/SliderUtils.java | 22 +++- .../providers/agent/AgentProviderService.java | 24 ++-- .../services/security/CertificateManager.java | 19 +-- .../services/security/KeystoreGenerator.java | 8 +- .../server/services/security/SecurityStore.java | 66 ++++++++++ .../security/SecurityStoreGenerator.java | 8 +- .../services/security/StoresGenerator.java | 21 ++-- .../services/security/TruststoreGenerator.java | 9 +- .../security/TestCertificateManager.java | 123 +++++++++++++------ 18 files changed, 274 insertions(+), 87 deletions(-) ----------------------------------------------------------------------
