accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [5/5] accumulo git commit: Merge branch '1.6'
Date Fri, 07 Nov 2014 18:31:11 GMT
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/5fdbb819
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5fdbb819
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5fdbb819

Branch: refs/heads/master
Commit: 5fdbb8191ce80eee49edfad4c19ca38ff23a4101
Parents: b5d7b94 4b87abd
Author: Josh Elser <elserj@apache.org>
Authored: Fri Nov 7 13:16:21 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Nov 7 13:16:21 2014 -0500

----------------------------------------------------------------------
 .../accumulo/server/util/RandomizeVolumes.java  | 15 ++++--
 .../apache/accumulo/test/FairVolumeChooser.java | 48 ++++++++++++++++++++
 .../test/RewriteTabletDirectoriesIT.java        | 19 ++++++--
 3 files changed, 75 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5fdbb819/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java
----------------------------------------------------------------------


Mime
View raw message