[08/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-12-18 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: bin/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a55f5d3f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a55f5d3f Diff: http:/

[08/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-12-04 Thread ecn
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c1fa5573 Tree:

[08/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-12-03 Thread ctubbsii
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cccdb8cb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cccdb8cb Diff: http://git-wip-us.apache.org/repos/asf/

[08/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-11-26 Thread ecn
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/374f46f4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/374f46f4 Diff: http://git-wip-us.apache.org/repos/asf/