Merge branch 'feature/SLIDER-802-cert-sign' into 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/bf293b9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/bf293b9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/bf293b9d Branch: refs/heads/develop Commit: bf293b9df7dd06ee80a6c8876d0463da38e61a8f Parents: 670bfb3 c1b8346 Author: Jon Maron <jma...@hortonworks.com> Authored: Fri Mar 6 18:14:46 2015 -0800 Committer: Jon Maron <jma...@hortonworks.com> Committed: Fri Mar 6 18:14:46 2015 -0800 ---------------------------------------------------------------------- .../slider/api/SliderClusterProtocol.java | 5 +- .../org/apache/slider/api/proto/Messages.java | 1503 +++++++++++++++++- .../slider/api/proto/RestTypeMarshalling.java | 24 + .../slider/api/proto/SliderClusterAPI.java | 81 +- .../org/apache/slider/client/SliderClient.java | 83 +- .../apache/slider/client/SliderClientAPI.java | 2 +- .../client/ipc/SliderClusterOperations.java | 21 +- .../slider/common/params/ActionClientArgs.java | 24 + .../apache/slider/common/params/Arguments.java | 5 + .../slider/common/params/SliderActions.java | 4 +- .../server/appmaster/SliderAppMaster.java | 6 +- .../rpc/SliderClusterProtocolPBImpl.java | 12 + .../rpc/SliderClusterProtocolProxy.java | 10 + .../server/appmaster/rpc/SliderIPCService.java | 36 + .../services/security/CertificateManager.java | 28 +- .../src/main/proto/SliderClusterMessages.proto | 11 + .../src/main/proto/SliderClusterProtocol.proto | 5 +- .../agent/TestAgentClientProvider2.java | 7 - .../AMClientCertStoreRetrievalIT.groovy | 174 ++ 19 files changed, 2003 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
