Merge branch '1.5.2-SNAPSHOT' into 1.6.1-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/c9d884fa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c9d884fa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c9d884fa
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: c9d884fa54025ff24e96b21229eb2e04d0ce9b48
Parents: e7c64d4 10950b5
Author: Josh Elser <els...@apache.org>
Authored: Thu Jul 24 17:47:15 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Thu Jul 24 17:47:15 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
