Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/system/auto/simple/examples.py
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b5e84bcd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b5e84bcd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b5e84bcd
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b5e84bcd3108b446747e92a4915f7c7afe7f4a2c
Parents: 114b58d d63cf6f
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Tue Dec 31 17:43:13 2013 -0500
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Tue Dec 31 17:43:13 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
