[5/8] 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

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

2014-03-20 Thread busbey
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/ef0eaaa0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ef0eaaa0 Diff: http://git-wip-us.apache.org/repos/asf/

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

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