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:22 UTC

[5/6] git commit: updated refs/heads/master to 70c79ad

Merge pull request #1799 from shapeblue/bcprov-upgrade

CLOUDSTACK-9632: Upgrade bouncy castle to version 1.55- Upgrades Maven dependency version to v1.55
- Fixes bountycastle usages and issues
- Adds timeout to jetty/annotation scanning
- Picks up PR #1510 by Daan

* pr/1799:
  CLOUDSTACK-9632: Upgrade bouncy castle to version 1.55

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/decb2e4d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/decb2e4d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/decb2e4d

Branch: refs/heads/master
Commit: decb2e4d2d8b35dbe4566a32f66b4d3a19871364
Parents: 8d506a6 abfcd5b
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Dec 7 01:34:29 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Dec 7 01:35:38 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(-)
----------------------------------------------------------------------