Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f4c4e7c8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f4c4e7c8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f4c4e7c8
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: f4c4e7c8cf54f8261a7244314c49768ab81e38ff
Parents: 8fda50a a27f60b
Author: Josh Elser <els...@apache.org>
Authored: Wed Feb 12 12:47:19 2014 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Wed Feb 12 12:47:19 2014 -0500
----------------------------------------------------------------------
CHANGES | 675 -----------------------------------------------------------
1 file changed, 675 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f4c4e7c8/CHANGES
----------------------------------------------------------------------
