[11/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-02-21 Thread elserj
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/63958404 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63958404 Diff: http://git-

[11/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-02-03 Thread bhavanki
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5117947c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5117947c Diff: http://git-wip-us.apache.org/repos/asf/

[11/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-29 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java test/system/auto/simple/zoo.py test/system/auto/simple/zo

[11/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-16 Thread bhavanki
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b5c054d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1b5c054d Diff: http://git-wip-us.apache.org/repos/asf/

[11/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-16 Thread bhavanki
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/main/java/org/apache/accumulo/test/randomwalk/State.java test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit

[11/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-10 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d1b53eda Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1b53eda Diff: http://git-wip-us.apache.org/repos/asf/