[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-27 Thread kturner
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/72c9af4c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72c9af4c Diff: http://git-wip-us.apache.org/repos/asf/

[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-24 Thread kturner
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java test/system/auto/simple/gc.py Project: http://git-wip-u

[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-14 Thread ecn
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/082adbfd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/082adbfd Diff: http://git-wip-us.apache.org/repos/asf/