Merge branch 'feature/SLIDER-792_avoid_cert_store_name_collision' 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/909b7c1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/909b7c1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/909b7c1a Branch: refs/heads/feature/package_simplification_II Commit: 909b7c1ae34522f3b83f634fba96f836d7083320 Parents: 24622cb 14aa6ed Author: Jon Maron <jma...@hortonworks.com> Authored: Tue Mar 3 11:06:28 2015 -0800 Committer: Jon Maron <jma...@hortonworks.com> Committed: Tue Mar 3 11:06:28 2015 -0800 ---------------------------------------------------------------------- .../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 +++++++++++++------ 8 files changed, 200 insertions(+), 78 deletions(-) ----------------------------------------------------------------------