Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/system/auto/simple/tablets.py
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7e95b3fa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7e95b3fa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7e95b3fa
Branch: refs/heads/master
Commit: 7e95b3fa7c21a4ccdd0049a8b83220d8f555e154
Parents: 3eccc35 613da73
Author: Josh Elser <els...@apache.org>
Authored: Wed Jan 29 16:46:41 2014 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Wed Jan 29 16:46:41 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
