[2/2] accumulo git commit: Merge branch '1.8'

2017-07-19 Thread ibella
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/80762e9f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/80762e9f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/80762e9f

[2/2] accumulo git commit: Merge branch '1.8'

2017-06-20 Thread mjwall
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c76b4dd3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c76b4dd3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c76b4dd3

[2/2] accumulo git commit: Merge branch '1.8'

2017-05-03 Thread mmiller
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f453f4d9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f453f4d9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f453f4d9

[2/2] accumulo git commit: Merge branch '1.8'

2017-03-20 Thread mmiller
Merge branch '1.8' Conflicts: server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManager.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf69e3f6 Tree:

[2/2] accumulo git commit: Merge branch '1.8'

2017-02-09 Thread mjwall
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1e000359 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1e000359 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1e000359

[2/2] accumulo git commit: Merge branch '1.8'

2017-01-24 Thread kturner
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c57b662 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c57b662 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c57b662

[2/2] accumulo git commit: Merge branch '1.8'

2016-10-11 Thread drew
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/016ea678 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/016ea678 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/016ea678

[2/2] accumulo git commit: Merge branch '1.8'

2016-10-11 Thread ctubbsii
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/551fa095 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/551fa095 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/551fa095

[2/2] accumulo git commit: Merge branch '1.8'

2016-10-04 Thread dlmarion
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1c218de9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1c218de9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1c218de9

[2/2] accumulo git commit: Merge branch '1.8'

2016-07-22 Thread kturner
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5df9bc16 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5df9bc16 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5df9bc16

[2/2] accumulo git commit: Merge branch '1.8'

2016-06-14 Thread dlmarion
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2b5b54be Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2b5b54be Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2b5b54be

[2/2] accumulo git commit: Merge branch '1.8'

2016-06-14 Thread dlmarion
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c521cf81 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c521cf81 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c521cf81

[2/2] accumulo git commit: Merge branch '1.8'

2016-06-13 Thread dlmarion
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4e9e01f4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4e9e01f4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4e9e01f4

[2/2] accumulo git commit: Merge branch '1.8'

2016-06-08 Thread dlmarion
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/35ab8cef Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/35ab8cef Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/35ab8cef

[2/2] accumulo git commit: Merge branch '1.8'

2016-06-03 Thread kturner
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f7481b4c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f7481b4c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f7481b4c

[2/2] accumulo git commit: Merge branch '1.8'

2016-05-10 Thread dlmarion
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e2856a4d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e2856a4d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e2856a4d