Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/system/auto/stress/restart.py
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bff86684
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bff86684
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bff86684
Branch: refs/heads/master
Commit: bff866845590cef8375d17d265127e34101d5dc2
Parents: f67603f ffd7232
Author: Josh Elser <els...@apache.org>
Authored: Mon Jan 27 23:03:05 2014 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Mon Jan 27 23:03:05 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
