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 <eric.new...@gmail.com>
Authored: Tue Nov 4 12:06:50 2014 -0500
Committer: Eric C. Newton <eric.new...@gmail.com>
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
----------------------------------------------------------------------
