[2/2] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-02-12 Thread vines
Merge remote-tracking branch 'origin/1.5.1-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/e9966e92 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e9966e92 Diff: http://git-wip-u

[2/2] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-02-04 Thread vines
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: assemble/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/279024fe Tree: http://git-wip-us.apache.org/repos/asf/accumulo

[2/2] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-29 Thread vines
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commi

[2/2] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT'

2013-10-23 Thread ecn
Merge remote-tracking branch 'origin/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/6b537d5e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6b537d5e Diff: http://git-wip-us.apache.org/repos/a

[2/2] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT'

2013-10-22 Thread ecn
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' Conflicts: test/system/auto/simple/simpleBalancer.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aceb5fbe Tree: http://git-wip-us.apache.org/repos/asf/acc

[2/2] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.5.1-SNAPSHOT-1.4.4-SNAPSHOT-merged

2013-07-23 Thread elserj
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.5.1-SNAPSHOT-1.4.4-SNAPSHOT-merged Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cb5a5431 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cb5a5431