Merge branch '1.5.2-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/5d030cae
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d030cae
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d030cae
Branch: refs/heads/master
Commit: 5d030cae908905de0b4bc51981c7690011d390c7
Parents: a5a0552 72c9af4
Author: Keith Turner <ktur...@apache.org>
Authored: Thu Mar 27 12:39:59 2014 -0400
Committer: Keith Turner <ktur...@apache.org>
Committed: Thu Mar 27 12:39:59 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
