Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5a58538e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a58538e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a58538e
Branch: refs/heads/master
Commit: 5a58538e41252c5c455219b8fcb29326c8b7631b
Parents: b4b0c0e 3079916
Author: Josh Elser <els...@apache.org>
Authored: Mon Feb 10 13:56:07 2014 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Mon Feb 10 13:56:07 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
