Return-Path: 
 <commits-return-17607-apmail-hive-commits-archive=hive.apache.org@hive.apache.org>
X-Original-To: apmail-hive-commits-archive@www.apache.org
Delivered-To: apmail-hive-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 675A317D4C
	for <apmail-hive-commits-archive@www.apache.org>;
 Fri, 25 Sep 2015 18:42:12 +0000 (UTC)
Received: (qmail 60769 invoked by uid 500); 25 Sep 2015 18:42:12 -0000
Delivered-To: apmail-hive-commits-archive@hive.apache.org
Received: (qmail 60694 invoked by uid 500); 25 Sep 2015 18:42:12 -0000
Mailing-List: contact commits-help@hive.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hive.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hive.apache.org>
List-Post: <mailto:commits@hive.apache.org>
List-Id: <commits.hive.apache.org>
Reply-To: hive-dev@hive.apache.org
Delivered-To: mailing list commits@hive.apache.org
Received: (qmail 60459 invoked by uid 99); 25 Sep 2015 18:42:12 -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; Fri, 25 Sep 2015 18:42:12 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id D8A45E0418; Fri, 25 Sep 2015 18:42:11 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: prasanthj@apache.org
To: commits@hive.apache.org
Date: Fri, 25 Sep 2015 18:42:14 -0000
Message-Id: <0b02ab68679944f7b5f8bd5488162b10@git.apache.org>
In-Reply-To: <a7630c4763a84bacb00cb16068f81132@git.apache.org>
References: <a7630c4763a84bacb00cb16068f81132@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [04/25] hive git commit: HIVE-11572: Datanucleus loads Log4j1.x
 Logger from AppClassLoader (Prasanth Jayachandran reviewed by Gopal V)

HIVE-11572: Datanucleus loads Log4j1.x Logger from AppClassLoader (Prasanth Jayachandran reviewed by Gopal V)


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

Branch: refs/heads/llap
Commit: e82bf253fa62881f6d976e97d1bf4646ad4187c6
Parents: 1c52a7e
Author: Prasanth Jayachandran <j.prasanth.j@gmail.com>
Authored: Tue Sep 22 19:06:51 2015 -0500
Committer: Prasanth Jayachandran <j.prasanth.j@gmail.com>
Committed: Tue Sep 22 19:06:51 2015 -0500

----------------------------------------------------------------------
 bin/hive                            | 2 +-
 packaging/src/main/assembly/bin.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/e82bf253/bin/hive
----------------------------------------------------------------------
diff --git a/bin/hive b/bin/hive
index ad7139e..505aee0 100755
--- a/bin/hive
+++ b/bin/hive
@@ -171,7 +171,7 @@ export HADOOP_HOME_WARN_SUPPRESS=true
 
 # pass classpath to hadoop
 if [ "$HADOOP_CLASSPATH" != "" ]; then
-  export HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${CLASSPATH}"
+  export HADOOP_CLASSPATH="${CLASSPATH}:${HADOOP_CLASSPATH}"
 else
   export HADOOP_CLASSPATH="$CLASSPATH"
 fi

http://git-wip-us.apache.org/repos/asf/hive/blob/e82bf253/packaging/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/packaging/src/main/assembly/bin.xml b/packaging/src/main/assembly/bin.xml
index 0fa6af8..b21732b 100644
--- a/packaging/src/main/assembly/bin.xml
+++ b/packaging/src/main/assembly/bin.xml
@@ -42,6 +42,7 @@
         <exclude>org.apache.hadoop:*</exclude>
         <exclude>org.apache.hive.hcatalog:*</exclude>
         <exclude>org.slf4j:*</exclude>
+        <exclude>log4j:*</exclude>
         <exclude>commons-configuration:commons-configuration</exclude>
       </excludes>
     </dependencySet>