[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-09-19 Thread ecn
Merge branch '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/73714365 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/73714365 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/737143

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-09-18 Thread cjnolet
Merge branch '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/5a8855be Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a8855be Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a8855

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-09-16 Thread ecn
Merge branch '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/58558e74 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/58558e74 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/58558e

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-09-11 Thread ecn
Merge branch '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/e3b0412e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e3b0412e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e3b041

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-08-28 Thread billie
Merge branch '1.6.1-SNAPSHOT' Conflicts: test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a4f5463 Tree: http://git-wip-us.apache.org/repos/asf

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-08-07 Thread ecn
Merge branch '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/6ef85f9c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6ef85f9c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6ef85f

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-08-06 Thread ecn
Merge branch '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/7c047e14 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c047e14 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c047e

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-08-05 Thread ecn
Merge branch '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/440281b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/440281b8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/440281

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-08-05 Thread ecn
Merge branch '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/c45c3570 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c45c3570 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c45c35

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-08-05 Thread ecn
Merge branch '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/962eb982 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/962eb982 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/962eb9

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-08-05 Thread ecn
Merge branch '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/c3d21956 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c3d21956 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c3d219

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-08-05 Thread ecn
Merge branch '1.6.1-SNAPSHOT' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e06e8df8 Tree: http://git-wip-us.apache.org/r

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-08-01 Thread ecn
Merge branch '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/3c11090f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c11090f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c1109

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-07-22 Thread ecn
Merge branch '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/ffba5393 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ffba5393 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ffba53

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-07-17 Thread ecn
Merge branch '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/bb24ea72 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bb24ea72 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bb24ea

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-07-17 Thread ecn
Merge branch '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/ff785d34 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ff785d34 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ff785d

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-06-04 Thread ecn
Merge branch '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/a7884bbe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a7884bbe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a7884b

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-05-23 Thread dlmarion
Merge branch '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/d6b1e9a9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d6b1e9a9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d6b1e9

[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-05-21 Thread dlmarion
Merge branch '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/58e7665a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/58e7665a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/58e766