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 9D41910ED9 for ; Thu, 24 Oct 2013 02:45:35 +0000 (UTC) Received: (qmail 1889 invoked by uid 500); 24 Oct 2013 02:45:30 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 1830 invoked by uid 500); 24 Oct 2013 02:45:29 -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 1764 invoked by uid 99); 24 Oct 2013 02:45:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Oct 2013 02:45:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 148268194FB; Thu, 24 Oct 2013 02:45:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mdrob@apache.org To: commits@accumulo.apache.org Date: Thu, 24 Oct 2013 02:45:31 -0000 Message-Id: <437360dd5dac4d2390f0a791b8dea40d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: Merge branch '1.5.1-SNAPSHOT' 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/d8288868 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d8288868 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d8288868 Branch: refs/heads/master Commit: d8288868621027646344b7a034a2997f847acbc6 Parents: 9d22d30 839351c Author: Mike Drob Authored: Wed Oct 23 22:43:50 2013 -0400 Committer: Mike Drob Committed: Wed Oct 23 22:43:50 2013 -0400 ---------------------------------------------------------------------- bin/etc_initd_accumulo | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ----------------------------------------------------------------------