Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java
test/system/auto/simple/zoo.py
test/system/auto/simple/zooCacheTest.py
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3eccc353
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3eccc353
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3eccc353
Branch: refs/heads/master
Commit: 3eccc35334949692d706eb80bdfb4835c581f6bf
Parents: d22816c 6716227
Author: Josh Elser <els...@apache.org>
Authored: Wed Jan 29 15:26:54 2014 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Wed Jan 29 15:26:54 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
