[5/5] accumulo git commit: Merge branch '1.7'

2016-04-15 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6fbf2d2b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6fbf2d2b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6fbf2d2b

[5/5] accumulo git commit: Merge branch '1.7'

2016-03-14 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5cb5b937 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5cb5b937 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5cb5b937

[5/5] accumulo git commit: Merge branch '1.7'

2016-01-27 Thread kturner
Merge branch '1.7' Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java

[5/5] accumulo git commit: Merge branch '1.7'

2015-10-24 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/04e91398 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04e91398 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04e91398

[5/5] accumulo git commit: Merge branch '1.7'

2015-10-02 Thread ecn
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/17ae2f91 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17ae2f91 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17ae2f91

[5/5] accumulo git commit: Merge branch '1.7'

2015-06-23 Thread ecn
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/121cc6bc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/121cc6bc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/121cc6bc

[5/5] accumulo git commit: Merge branch '1.7'

2015-06-12 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5eede28e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5eede28e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5eede28e

[5/5] accumulo git commit: Merge branch '1.7'

2015-06-03 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6965c41c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6965c41c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6965c41c

[5/5] accumulo git commit: Merge branch '1.7'

2015-05-27 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d1cb76a4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1cb76a4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d1cb76a4

[5/5] accumulo git commit: Merge branch '1.7'

2015-05-13 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eeca25db Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eeca25db Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eeca25db

[5/5] accumulo git commit: Merge branch '1.7'

2015-05-13 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dbea7982 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dbea7982 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dbea7982

[5/5] accumulo git commit: Merge branch '1.7'

2015-05-12 Thread ctubbsii
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0b7d00db Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0b7d00db Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0b7d00db

[5/5] accumulo git commit: Merge branch '1.7'

2015-05-11 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b30bc3ea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b30bc3ea Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b30bc3ea

[5/5] accumulo git commit: Merge branch '1.7'

2015-05-06 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46f76023 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46f76023 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46f76023

[5/5] accumulo git commit: Merge branch '1.7'

2015-04-30 Thread elserj
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e25146d0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e25146d0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e25146d0