Return-Path: 
 <commits-return-33122-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
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 E570A10DED
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Tue, 22 Oct 2013 00:59:50 +0000 (UTC)
Received: (qmail 97659 invoked by uid 500); 22 Oct 2013 00:59:50 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 97641 invoked by uid 500); 22 Oct 2013 00:59:50 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 97634 invoked by uid 99); 22 Oct 2013 00:59:50 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Oct 2013 00:59:50 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 8F70C4FD25; Tue, 22 Oct 2013 00:59:50 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: frankzhang@apache.org
To: commits@cloudstack.apache.org
Message-Id: <754aacc29fe34d19bfaf1a7ccfc47855@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: updated refs/heads/4.2 to 455a9f4
Date: Tue, 22 Oct 2013 00:59:50 +0000 (UTC)

Updated Branches:
  refs/heads/4.2 9a2769009 -> 455a9f479


[UCS] don't log user credentials


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

Branch: refs/heads/4.2
Commit: 455a9f47974c7c25456311c3517408c3604f1263
Parents: 9a27690
Author: Frank.Zhang <frank.zhang@citrix.com>
Authored: Mon Oct 21 17:59:26 2013 -0700
Committer: Frank.Zhang <frank.zhang@citrix.com>
Committed: Mon Oct 21 17:59:26 2013 -0700

----------------------------------------------------------------------
 .../hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/455a9f47/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java
index 5bbec66..c2f6383 100755
--- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java
+++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java
@@ -55,7 +55,9 @@ public class UcsHttpClient {
         requestHeaders.setContentType(MediaType.APPLICATION_XML);
         requestHeaders.setContentLength(body.length());
         HttpEntity<String> req = new HttpEntity<String>(body, requestHeaders);
-        logger.debug(String.format("UCS call: %s", body));
+        if (!body.contains("aaaLogin")) {
+            logger.debug(String.format("UCS call: %s", body));
+        }
         ResponseEntity<String> rsp = template.exchange(uri, HttpMethod.POST, req, String.class);
         if (rsp.getStatusCode() == org.springframework.http.HttpStatus.OK) {
             return rsp.getBody();