You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/12/06 20:06:23 UTC
[6/6] git commit: updated refs/heads/master to 70c79ad
Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/70c79ad1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/70c79ad1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/70c79ad1
Branch: refs/heads/master
Commit: 70c79ad13caa5c2264fa8f00ac8ebf66ee1309ae
Parents: 08a5ef7 decb2e4
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Dec 7 01:35:56 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Dec 7 01:35:56 2016 +0530
----------------------------------------------------------------------
api/pom.xml | 2 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 1 -
.../server/ServerTransportProvider.java | 29 +-
.../framework/transport/TransportAddress.java | 2 +-
.../security/keystore/KeystoreManagerImpl.java | 3 +-
framework/spring/module/pom.xml | 2 +-
.../network/resource/NetscalerResource.java | 1650 +++++++++---------
pom.xml | 12 +-
server/pom.xml | 2 +-
server/src/com/cloud/api/ApiServer.java | 159 +-
.../cloudstack/network/lb/CertServiceImpl.java | 445 ++---
.../cloudstack/network/lb/CertServiceTest.java | 422 ++---
services/console-proxy-rdp/rdpconsole/pom.xml | 4 +-
.../java/streamer/bco/BcoSocketWrapperImpl.java | 53 +-
tools/travis/before_script.sh | 2 +-
utils/pom.xml | 2 +-
.../java/com/cloud/utils/PasswordGenerator.java | 10 +
.../cloud/utils/security/CertificateHelper.java | 156 +-
18 files changed, 1423 insertions(+), 1533 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70c79ad1/api/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70c79ad1/framework/spring/module/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70c79ad1/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70c79ad1/server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70c79ad1/services/console-proxy-rdp/rdpconsole/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70c79ad1/utils/pom.xml
----------------------------------------------------------------------