Merge branch 'feature/SLIDER-585_add_keystore_gen_code' 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/00542b8f Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/00542b8f Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/00542b8f Branch: refs/heads/develop Commit: 00542b8f11c415da5a5f61863bb2710b8ed81b92 Parents: 053c3c1 4344600 Author: Jon Maron <[email protected]> Authored: Tue Feb 3 11:29:30 2015 -0500 Committer: Jon Maron <[email protected]> Committed: Tue Feb 3 11:29:30 2015 -0500 ---------------------------------------------------------------------- .../providers/agent/AgentProviderService.java | 2 +- .../services/security/CertificateManager.java | 38 ++++++- .../server/services/security/SecurityUtils.java | 10 +- .../security/TestCertificateManager.java | 102 ++++++++++++++++++- 4 files changed, 133 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
