Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BC7EC200BE4 for ; Tue, 6 Dec 2016 21:06:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BB23A160B29; Tue, 6 Dec 2016 20:06:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 19ED6160B2D for ; Tue, 6 Dec 2016 21:06:19 +0100 (CET) Received: (qmail 18444 invoked by uid 500); 6 Dec 2016 20:06:19 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 18214 invoked by uid 99); 6 Dec 2016 20:06:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Dec 2016 20:06:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B68B7F1712; Tue, 6 Dec 2016 20:06:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Tue, 06 Dec 2016 20:06:23 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: updated refs/heads/master to 70c79ad archived-at: Tue, 06 Dec 2016 20:06:20 -0000 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 Authored: Wed Dec 7 01:35:56 2016 +0530 Committer: Rohit Yadav 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 ----------------------------------------------------------------------