subject:"\[6\/7\] git commit\: Merge branch '1.5.2\-SNAPSHOT' into 1.6.1\-SNAPSHOT"

[6/7] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-07-24 Thread elserj

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/e7c64d47 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7c64d47 Diff: http://git-wip-us.apache.org/repos/asf/

[6/7] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-06-23 Thread elserj

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fd080f03 Tree: http://git-wip-u

[6/7] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-05-16 Thread elserj

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/0cdd5fd0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0cdd5fd0 Diff: http://git-wip-us.apache.org/repos/asf/