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 441291031B for ; Wed, 22 Jan 2014 17:14:44 +0000 (UTC) Received: (qmail 18615 invoked by uid 500); 22 Jan 2014 17:14:43 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 18540 invoked by uid 500); 22 Jan 2014 17:14:42 -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 18532 invoked by uid 99); 22 Jan 2014 17:14:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jan 2014 17:14:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 424328A0048; Wed, 22 Jan 2014 17:14:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Wed, 22 Jan 2014 17:14:42 -0000 Message-Id: <99c6a0a7291c4a769e0515b72d253156@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: ACCUMULO-2237 eliminate warning Updated Branches: refs/heads/master 7b6834dff -> 04f485478 ACCUMULO-2237 eliminate warning Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/383bf6dd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/383bf6dd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/383bf6dd Branch: refs/heads/master Commit: 383bf6dd3e4ee99b6c26f8e5ac5989bf720726d6 Parents: e57795c Author: Eric Newton Authored: Wed Jan 22 12:14:34 2014 -0500 Committer: Eric Newton Committed: Wed Jan 22 12:14:34 2014 -0500 ---------------------------------------------------------------------- test/system/continuous/mapred-setup.sh | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/383bf6dd/test/system/continuous/mapred-setup.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/mapred-setup.sh b/test/system/continuous/mapred-setup.sh index 2f8340b..e6bd2ca 100755 --- a/test/system/continuous/mapred-setup.sh +++ b/test/system/continuous/mapred-setup.sh @@ -18,10 +18,6 @@ # a little helper script that other scripts can source to setup # for running a map reduce job -if [ -z "$ACCUMULO_CONF_DIR" ]; then - ACCUMULO_CONF_DIR=${ACCUMULO_HOME}/conf -fi - CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/} . $CONTINUOUS_CONF_DIR/continuous-env.sh . $ACCUMULO_CONF_DIR/accumulo-env.sh