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 0FFC110362 for ; Mon, 25 Nov 2013 13:58:39 +0000 (UTC) Received: (qmail 50015 invoked by uid 500); 25 Nov 2013 13:58:32 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 49970 invoked by uid 500); 25 Nov 2013 13:58:26 -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 49955 invoked by uid 99); 25 Nov 2013 13:58:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Nov 2013 13:58:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 47C6190603E; Mon, 25 Nov 2013 13:58:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Date: Mon, 25 Nov 2013 13:58:26 -0000 Message-Id: <2690a7b2dac141b1a123fe73404947c0@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/src/main/java/org/apache/accumulo/test/CreateRFiles.java test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/17ac6920 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17ac6920 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17ac6920 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 17ac692035ebd5c9f05dcbde9adf85915b05bb7b Parents: 100e75b d0ceebb Author: Keith Turner Authored: Mon Nov 25 08:52:36 2013 -0500 Committer: Keith Turner Committed: Mon Nov 25 08:52:36 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------