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

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

[2/5] accumulo git commit: ACCUMULO-4138 Remove unused option

2016-03-14 Thread ctubbsii
ACCUMULO-4138 Remove unused option Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ecfd95ce Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ecfd95ce Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e

[1/5] accumulo git commit: ACCUMULO-4138 Remove unused option

2016-03-14 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.7 37857c532 -> 422815aa2 refs/heads/master 0f2f80d97 -> 5cb5b9372 ACCUMULO-4138 Remove unused option Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ecfd95ce Tree

[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 Branch:

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

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

accumulo git commit: ACCUMULO-4138 Remove unused option

2016-03-14 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6 b8836be25 -> ecfd95ce3 ACCUMULO-4138 Remove unused option Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ecfd95ce Tree: http://git-wip-us.apache.org/repos/asf/ac

accumulo git commit: Jekyll build from gh-pages:3de6faf

2016-03-14 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/asf-site 4f9846846 -> 30999fdbe Jekyll build from gh-pages:3de6faf Remove conflicting index file from 'jekyll new' and use jekyll --safe Update site instructions Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git

[2/2] accumulo git commit: Update site instructions

2016-03-14 Thread ctubbsii
Update site instructions Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3de6faf8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3de6faf8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3de6faf8 B

[1/2] accumulo git commit: Remove conflicting index file from 'jekyll new' and use jekyll --safe

2016-03-14 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/gh-pages 01abb4be6 -> 3de6faf86 Remove conflicting index file from 'jekyll new' and use jekyll --safe Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0908bb74 Tree: h

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

2016-03-14 Thread kturner
Merge branch '1.7' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java Pro

[1/2] accumulo git commit: ACCUMULO-4112 use metadata table durability config when writing minc events to walog

2016-03-14 Thread kturner
Repository: accumulo Updated Branches: refs/heads/master db2131598 -> 0f2f80d97 ACCUMULO-4112 use metadata table durability config when writing minc events to walog Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/37

accumulo git commit: ACCUMULO-4112 use metadata table durability config when writing minc events to walog

2016-03-14 Thread kturner
Repository: accumulo Updated Branches: refs/heads/1.7 e52d5476e -> 37857c532 ACCUMULO-4112 use metadata table durability config when writing minc events to walog Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/37857

[accumulo] Git Push Summary

2016-03-14 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/asf-site [created] 4f9846846

[accumulo] Git Push Summary

2016-03-14 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/accumulo.apache.org [deleted] 4f9846846

accumulo git commit: Use asf-site for published branch name

2016-03-14 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/gh-pages 3afd48d9b -> 01abb4be6 Use asf-site for published branch name Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/01abb4be Tree: http://git-wip-us.apache.org/rep