Merge branch 'feature/SLIDER-749_jenkins_on_windows_failing' 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/2ad763cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/2ad763cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/2ad763cf Branch: refs/heads/develop Commit: 2ad763cfb890bfd992006850fc423ae0d75f1f41 Parents: 4c9268b 4cec507 Author: Steve Loughran <[email protected]> Authored: Mon Jan 12 16:39:29 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Mon Jan 12 16:39:29 2015 +0000 ---------------------------------------------------------------------- .../services/security/CertificateManager.java | 25 ++-- .../slider/other/TestLocalDirStatus.groovy | 87 ++++++++++++++ .../web/rest/agent/TestAMAgentWebServices.java | 37 +++--- .../security/TestCertificateManager.java | 4 +- .../org/apache/slider/tools/TestUtility.java | 114 ++++++++++++++++++- 5 files changed, 232 insertions(+), 35 deletions(-) ----------------------------------------------------------------------
