Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D511910F4B for ; Mon, 11 Nov 2013 18:29:56 +0000 (UTC) Received: (qmail 54854 invoked by uid 500); 11 Nov 2013 18:29:56 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 54808 invoked by uid 500); 11 Nov 2013 18:29:56 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 54801 invoked by uid 99); 11 Nov 2013 18:29:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Nov 2013 18:29:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 84FE68A25C1; Mon, 11 Nov 2013 18:29:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swagle@apache.org To: ambari-commits@incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-3739. Remove Exception message printed to log for successful starts. (swagle) Date: Mon, 11 Nov 2013 18:29:56 +0000 (UTC) Updated Branches: refs/heads/trunk fd38de564 -> 2ad9c330c AMBARI-3739. Remove Exception message printed to log for successful starts. (swagle) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/2ad9c330 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/2ad9c330 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/2ad9c330 Branch: refs/heads/trunk Commit: 2ad9c330c670defd4968562a4167f8583ca354d4 Parents: fd38de5 Author: Siddharth Wagle Authored: Mon Nov 11 10:08:48 2013 -0800 Committer: Siddharth Wagle Committed: Mon Nov 11 10:17:20 2013 -0800 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/configuration/Configuration.java | 2 +- .../ambari/server/security/encryption/MasterKeyServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2ad9c330/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java index 59404fe..cf749a9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java @@ -422,7 +422,7 @@ public class Configuration { this.credentialProvider = new CredentialProvider(null, getMasterKeyLocation(), isMasterKeyPersisted()); } catch (Exception e) { - LOG.info("Credential provider creation failed.\n" + e.getMessage()); + LOG.info("Credential provider creation failed. Reason: " + e.getMessage()); if (LOG.isDebugEnabled()) { e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2ad9c330/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/MasterKeyServiceImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/MasterKeyServiceImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/MasterKeyServiceImpl.java index 3b15db4..219c14b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/MasterKeyServiceImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/MasterKeyServiceImpl.java @@ -106,7 +106,7 @@ public class MasterKeyServiceImpl implements MasterKeyService { if (key != null) { this.master = key.toCharArray(); } else { - LOG.error("Master key is not provided as a System property or an " + + LOG.debug("Master key is not provided as a System property or an " + "environment varialble."); } }