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

2017-06-08 Thread ctubbsii
Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/da695f60 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da695f60 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/da695f60

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

2017-06-08 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/5956d456 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5956d456 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5956d456 Branch:

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

2017-06-08 Thread ctubbsii
Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/da695f60 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da695f60 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/da695f60

[2/6] accumulo git commit: ACCUMULO-4640 Fix SiteConfiguration parent

2017-06-08 Thread ctubbsii
ACCUMULO-4640 Fix SiteConfiguration parent Removes the use of client configuration as the parent to SiteConfiguration. Always use DefaultConfiguration as its parent. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4effd

[3/6] accumulo git commit: ACCUMULO-4640 Fix SiteConfiguration parent

2017-06-08 Thread ctubbsii
ACCUMULO-4640 Fix SiteConfiguration parent Removes the use of client configuration as the parent to SiteConfiguration. Always use DefaultConfiguration as its parent. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4effd

[1/6] accumulo git commit: ACCUMULO-4640 Fix SiteConfiguration parent

2017-06-08 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.7 2ff26780e -> 4effd0e9a refs/heads/1.8 116da380a -> da695f604 refs/heads/master 39efb48d0 -> 5956d4569 ACCUMULO-4640 Fix SiteConfiguration parent Removes the use of client configuration as the parent to SiteConfiguration. Always use Defa