[5/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-08-22 Thread ctubbsii
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/45d61cb3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/45d61cb3 Diff: http://git-wip-us.apache.org/repos/asf/

[5/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-08-03 Thread busbey
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java server/src/main/java/org/apa

[5/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-07-23 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d274a8ed Tree: http://git-wip-us.