accumulo git commit: ACCUMULO-4409 Fix typo from merge conflict

2017-03-09 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/master 5a18575d2 -> abf78169d ACCUMULO-4409 Fix typo from merge conflict Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/abf78169 Tree: http://git-wip-us.apache.org/r

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

2017-03-09 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/5a18575d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a18575d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a18575d Branch:

[2/5] accumulo git commit: ACCUMULO-4600: Fix to properly read from accumulo-site.xml

2017-03-09 Thread ctubbsii
ACCUMULO-4600: Fix to properly read from accumulo-site.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/80373557 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/80373557 Diff: http://git-wip-us.apache.org/r

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

2017-03-09 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/dba44475 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dba44475 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dba44475

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

2017-03-09 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/dba44475 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dba44475 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dba44475

[1/5] accumulo git commit: ACCUMULO-4600: Fix to properly read from accumulo-site.xml

2017-03-09 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.8 7ca6332df -> dba444757 refs/heads/master 3020c18b9 -> 5a18575d2 ACCUMULO-4600: Fix to properly read from accumulo-site.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accum

accumulo git commit: ACCUMULO-4600: Fix to properly read from accumulo-site.xml

2017-03-09 Thread mmiller
Repository: accumulo Updated Branches: refs/heads/1.7 de80cf53b -> 80373557b ACCUMULO-4600: Fix to properly read from accumulo-site.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/80373557 Tree: http://git-wip-us

accumulo git commit: Accumulo-4599 Simplify how accumulo runs client jars

2017-03-09 Thread mwalch
Repository: accumulo Updated Branches: refs/heads/master cbdf02e33 -> 3020c18b9 Accumulo-4599 Simplify how accumulo runs client jars * Improved documentation and simplified methods for running accumulo client jars * Removed ACCUMULO_XTRAJARS variable and 'accumulo jar' command * Removed '-add'