Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A235E186FD for ; Mon, 17 Aug 2015 11:56:57 +0000 (UTC) Received: (qmail 13300 invoked by uid 500); 17 Aug 2015 11:56:57 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 13186 invoked by uid 500); 17 Aug 2015 11:56:57 -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 13168 invoked by uid 99); 17 Aug 2015 11:56:57 -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; Mon, 17 Aug 2015 11:56:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4165FE01E0; Mon, 17 Aug 2015 11:56:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Mon, 17 Aug 2015 11:56:59 -0000 Message-Id: In-Reply-To: <87d092ff256146f8ac4c272d20241760@git.apache.org> References: <87d092ff256146f8ac4c272d20241760@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: updated refs/heads/master to 9c7e81e Merge pull request #695 from karuturi/CLOUDSTACK-8669 CLOUDSTACK-8669: create volume failed due to null charsetAdded a new private method getCharSetFromConnection() which checks if the connection charset is null and if it is null, returns StringUtils.getPreferredCharset regression caused by commit f03411ca0436c8b52f5e60b0c8820fd1d1ba2ff6 * pr/695: CLOUDSTACK-8669: create volume failed due to null charset CLOUDSTACK-8669: making StringUtils.getDefaultCharset protected Signed-off-by: Remi Bergsma Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9c7e81e7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c7e81e7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c7e81e7 Branch: refs/heads/master Commit: 9c7e81e7489cdb2b9a8d2d18357070a39a595d47 Parents: b407c52 c180a6d Author: Remi Bergsma Authored: Mon Aug 17 13:54:53 2015 +0200 Committer: Remi Bergsma Committed: Mon Aug 17 13:54:54 2015 +0200 ---------------------------------------------------------------------- utils/src/com/cloud/utils/StringUtils.java | 2 +- .../hypervisor/vmware/util/VmwareContext.java | 20 +++++++-- .../vmware/util/VmwareContextTest.java | 47 ++++++++++++++++++++ 3 files changed, 65 insertions(+), 4 deletions(-) ----------------------------------------------------------------------