Merge branch 'origin/CLOUDSTACK-7468'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cacbc80a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cacbc80a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cacbc80a Branch: refs/heads/master Commit: cacbc80ab134e869fe37aaa72b5b2a9fc6ceae7b Parents: e491716 5d11385 Author: Will Stevens <[email protected]> Authored: Thu Sep 4 14:08:07 2014 -0400 Committer: Will Stevens <[email protected]> Committed: Thu Sep 4 14:08:07 2014 -0400 ---------------------------------------------------------------------- .../user/loadbalancer/ListSslCertsCmd.java | 8 +++ .../user/loadbalancer/UploadSslCertCmd.java | 23 +++++++ .../api/response/SslCertResponse.java | 32 ++++++++++ .../cloudstack/network/lb/CertServiceImpl.java | 64 +++++++++++++++++--- .../cloudstack/network/lb/CertServiceTest.java | 63 ++++++++++++++++++- 5 files changed, 180 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
