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 DA3DF10DCF for ; Wed, 11 Sep 2013 01:29:31 +0000 (UTC) Received: (qmail 44879 invoked by uid 500); 11 Sep 2013 01:29:31 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 44847 invoked by uid 500); 11 Sep 2013 01:29:31 -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 44757 invoked by uid 99); 11 Sep 2013 01:29:31 -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, 11 Sep 2013 01:29:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 74A8B8BD2B7; Wed, 11 Sep 2013 01:29:31 +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: Wed, 11 Sep 2013 01:29:33 -0000 Message-Id: <8e911070a3f94253b306f5f54e945937@git.apache.org> In-Reply-To: <2d5e6bedef3848a0b91926f5b275eb32@git.apache.org> References: <2d5e6bedef3848a0b91926f5b275eb32@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: ACCUMULO-1698 Merge branch '1.5.1-SNAPSHOT' ACCUMULO-1698 Merge branch '1.5.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63c5d64c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63c5d64c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/63c5d64c Branch: refs/heads/master Commit: 63c5d64cbc8ae30d06da84bb36324eca38fc0e36 Parents: 1ec9f8f cd13583 Author: Josh Elser Authored: Tue Sep 10 21:29:42 2013 -0400 Committer: Josh Elser Committed: Tue Sep 10 21:29:42 2013 -0400 ---------------------------------------------------------------------- bin/stop-here.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------