subject:"\[6\/8\] git commit\: Merge branch '1.4.5\-SNAPSHOT' into 1.5.1\-SNAPSHOT"

[6/8] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-11-19 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/5221747d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5221747d Diff:

[6/8] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-11-08 Thread vines

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/system/auto/TestUtils.py test/system/continuous/agitator.pl Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4227 Tree: