subject:"\[4\/5\] git commit\: Merge branch '1.5.2\-SNAPSHOT' into 1.6.0\-SNAPSHOT"

[4/5] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-04-18 Thread ctubbsii

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1645b4f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1645b4f6 Diff: http://git-

[4/5] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-03-25 Thread ecn

Merge branch '1.5.2-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/fd99e24d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd99e24d Diff: http://git-wip-us.apache.org/repos/asf/

[4/5] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-03-21 Thread ecn

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/system/auto/README.md Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a729c889 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a729c88