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 24DA811107 for ; Sat, 14 Jun 2014 04:35:44 +0000 (UTC) Received: (qmail 23796 invoked by uid 500); 14 Jun 2014 04:35:43 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 23687 invoked by uid 500); 14 Jun 2014 04:35:43 -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 23600 invoked by uid 99); 14 Jun 2014 04:35:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jun 2014 04:35:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 34A66934866; Sat, 14 Jun 2014 04:35:43 +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: Sat, 14 Jun 2014 04:35:47 -0000 Message-Id: <9aef6cc319d44f1baf0fe8eddbb9be89@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/50] [abbrv] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/45b7e295 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/45b7e295 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/45b7e295 Branch: refs/heads/ACCUMULO-378 Commit: 45b7e29577d4dba24374128403ad99e6d32ee40b Parents: 0356387 53ec689 Author: Eric C. Newton Authored: Tue Jun 10 16:53:54 2014 -0400 Committer: Eric C. Newton Committed: Tue Jun 10 16:53:54 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/core/cli/BatchWriterOpts.java | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------