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 5D3A210DEB for ; Tue, 4 Nov 2014 17:07:32 +0000 (UTC) Received: (qmail 35571 invoked by uid 500); 4 Nov 2014 17:07:32 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 35469 invoked by uid 500); 4 Nov 2014 17:07:32 -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 35449 invoked by uid 99); 4 Nov 2014 17:07:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2014 17:07:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ED0B08AE2CB; Tue, 4 Nov 2014 17:07:31 +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: Tue, 04 Nov 2014 17:07:33 -0000 Message-Id: In-Reply-To: <98a3629509924209838a3ca0abc7c292@git.apache.org> References: <98a3629509924209838a3ca0abc7c292@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6' Merge branch '1.6' Conflicts: server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7196b0c5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7196b0c5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7196b0c5 Branch: refs/heads/master Commit: 7196b0c58bc4b1c0d16e3b815675e4ab1efba5f8 Parents: 8cdceeb ea58cc8 Author: Eric C. Newton Authored: Tue Nov 4 12:06:50 2014 -0500 Committer: Eric C. Newton Committed: Tue Nov 4 12:06:50 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/server/client/BulkImporter.java | 10 ++++++++-- .../org/apache/accumulo/server/util/RandomizeVolumes.java | 5 ++--- 2 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7196b0c5/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7196b0c5/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java ----------------------------------------------------------------------