Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/system/auto/simple/mapreduce.py
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0b0ef709
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0b0ef709
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0b0ef709
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0b0ef70986d83e3d266137d4fbb4a6350233f282
Parents: 732f037 4dd2d66
Author: Eric Newton <eric.new...@gmail.com>
Authored: Wed Feb 19 17:23:58 2014 -0500
Committer: Eric Newton <eric.new...@gmail.com>
Committed: Wed Feb 19 17:23:58 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
