Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 6462A10EFD for ; Fri, 19 Dec 2014 00:29:12 +0000 (UTC) Received: (qmail 48166 invoked by uid 500); 19 Dec 2014 00:29:12 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 48063 invoked by uid 500); 19 Dec 2014 00:29:12 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 48028 invoked by uid 99); 19 Dec 2014 00:29:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Dec 2014 00:29:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 06A9F9CB0F4; Fri, 19 Dec 2014 00:29:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Fri, 19 Dec 2014 00:29:12 -0000 Message-Id: In-Reply-To: <44cd60d4061842369dde668df6e0a78f@git.apache.org> References: <44cd60d4061842369dde668df6e0a78f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/13] accumulo git commit: Revert "ACCUMULO-2829 Add accumulo-mapreduce.jar to libjars in tool.sh" Revert "ACCUMULO-2829 Add accumulo-mapreduce.jar to libjars in tool.sh" This reverts commit 6fbd35d93a1f9861a529a53d0353f5457ad21493. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/23e798ec Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/23e798ec Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/23e798ec Branch: refs/heads/master Commit: 23e798ec072f7fbd28a858a3f4458af1ef209859 Parents: d62caad Author: Josh Elser Authored: Thu Dec 18 14:54:47 2014 -0500 Committer: Josh Elser Committed: Thu Dec 18 19:28:49 2014 -0500 ---------------------------------------------------------------------- assemble/bin/tool.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/23e798ec/assemble/bin/tool.sh ---------------------------------------------------------------------- diff --git a/assemble/bin/tool.sh b/assemble/bin/tool.sh index 701c15f..de1d608 100755 --- a/assemble/bin/tool.sh +++ b/assemble/bin/tool.sh @@ -44,7 +44,6 @@ fi ZOOKEEPER_LIB=$(eval $ZOOKEEPER_CMD) LIB="$ACCUMULO_HOME/lib" -MAPREDUCE_LIB="$LIB/accumulo-mapreduce.jar" CORE_LIB="$LIB/accumulo-core.jar" FATE_LIB="$LIB/accumulo-fate.jar" THRIFT_LIB="$LIB/libthrift.jar" @@ -72,8 +71,8 @@ for arg in "$@"; do fi done -LIB_JARS="$THRIFT_LIB,$MAPREDUCE_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$TRACE_LIB,$JCOMMANDER_LIB,$COMMONS_VFS_LIB,$GUAVA_LIB" -H_JARS="$THRIFT_LIB:$MAPREDUCE_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$TRACE_LIB:$JCOMMANDER_LIB:$COMMONS_VFS_LIB:$GUAVA_LIB" +LIB_JARS="$THRIFT_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$TRACE_LIB,$JCOMMANDER_LIB,$COMMONS_VFS_LIB,$GUAVA_LIB" +H_JARS="$THRIFT_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$TRACE_LIB:$JCOMMANDER_LIB:$COMMONS_VFS_LIB:$GUAVA_LIB" for jar in $USERJARS; do LIB_JARS="$LIB_JARS,$jar"