[1/3] git commit: ACCUMULO-2566 Fix botched merge

2014-03-28 Thread mdrob
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 0d2cd1c06 -> 34a44e700 refs/heads/1.6.0-SNAPSHOT 3354b92af -> 9843911d9 ACCUMULO-2566 Fix botched merge Fixing a bad merge for TeraSortIngest using reflection to get hadoop configuration objects. Copied the code from InputForma

[2/3] git commit: ACCUMULO-2566 Fix botched merge

2014-03-28 Thread mdrob
ACCUMULO-2566 Fix botched merge Fixing a bad merge for TeraSortIngest using reflection to get hadoop configuration objects. Copied the code from InputFormatBase because the method we need is not visible and adding it to the public API would be a terrible, terrible thing to do. Project: http://gi

[3/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-03-28 Thread mdrob
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9843911d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9843911d Diff: http://git-wip-us.apache.org/repos/asf/

[17/19] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-03-28 Thread mdrob
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3354b92a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3354b92a Diff: http://git-wip-us.apache.org/repos/asf/

[11/19] git commit: ACCUMULO-2566 More reflection for hadoop 1/2

2014-03-28 Thread mdrob
ACCUMULO-2566 More reflection for hadoop 1/2 Pull counter reflection out of ContinuousVerify and apply it to server utils that are using it. Add reflection to TeraSortIngest. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/com

[10/19] git commit: ACCUMULO-2566 More reflection for hadoop 1/2

2014-03-28 Thread mdrob
ACCUMULO-2566 More reflection for hadoop 1/2 Pull counter reflection out of ContinuousVerify and apply it to server utils that are using it. Add reflection to TeraSortIngest. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/com

[09/19] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-28 Thread mdrob
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2cca3ee0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2cca3ee0 Diff: http://git-wip-us.apache.org/repos/asf/

[12/19] git commit: ACCUMULO-2566 More reflection for hadoop 1/2

2014-03-28 Thread mdrob
ACCUMULO-2566 More reflection for hadoop 1/2 Pull counter reflection out of ContinuousVerify and apply it to server utils that are using it. Add reflection to TeraSortIngest. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/com

[08/19] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-28 Thread mdrob
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2cca3ee0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2cca3ee0 Diff: http://git-wip-us.apache.org/repos/asf/

[16/19] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-28 Thread mdrob
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Conflicts: src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java src/server/src/main/ja

[13/19] git commit: ACCUMULO-2566 More reflection for hadoop 1/2

2014-03-28 Thread mdrob
ACCUMULO-2566 More reflection for hadoop 1/2 Pull counter reflection out of ContinuousVerify and apply it to server utils that are using it. Add reflection to TeraSortIngest. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/com

[14/19] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-28 Thread mdrob
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Conflicts: src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java src/server/src/main/ja

[19/19] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-03-28 Thread mdrob
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/51761404 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51761404 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/517614

[06/19] git commit: ACCUMULO-2564 Backport changes to unify Hadoop 1/2

2014-03-28 Thread mdrob
ACCUMULO-2564 Backport changes to unify Hadoop 1/2 This is a backport of the changes made for Accumulo 1.5.0 and 1.5.1 to establish binary compatibility with both Hadoop 1 and 2 branches. This work was originally done under several commits and issues, as outlined below. Additionally, there was som

[07/19] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-28 Thread mdrob
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2cca3ee0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2cca3ee0 Diff: http://git-wip-us.apache.org/repos/asf/

[15/19] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-28 Thread mdrob
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Conflicts: src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java src/server/src/main/ja

[04/19] git commit: ACCUMULO-2564 Backport changes to unify Hadoop 1/2

2014-03-28 Thread mdrob
ACCUMULO-2564 Backport changes to unify Hadoop 1/2 This is a backport of the changes made for Accumulo 1.5.0 and 1.5.1 to establish binary compatibility with both Hadoop 1 and 2 branches. This work was originally done under several commits and issues, as outlined below. Additionally, there was som

[18/19] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-03-28 Thread mdrob
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3354b92a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3354b92a Diff: http://git-wip-us.apache.org/repos/asf/

[02/19] git commit: Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT

2014-03-28 Thread mdrob
Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5b479243 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5

[01/19] git commit: Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT

2014-03-28 Thread mdrob
Repository: accumulo Updated Branches: refs/heads/1.4.5-SNAPSHOT 1258b4e03 -> f0759dcb8 refs/heads/1.5.2-SNAPSHOT 5b4792431 -> 0d2cd1c06 refs/heads/1.6.0-SNAPSHOT d2089c898 -> 3354b92af refs/heads/master a831aca24 -> 51761404c Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.or

[05/19] git commit: ACCUMULO-2564 Backport changes to unify Hadoop 1/2

2014-03-28 Thread mdrob
ACCUMULO-2564 Backport changes to unify Hadoop 1/2 This is a backport of the changes made for Accumulo 1.5.0 and 1.5.1 to establish binary compatibility with both Hadoop 1 and 2 branches. This work was originally done under several commits and issues, as outlined below. Additionally, there was som

[03/19] git commit: ACCUMULO-2564 Backport changes to unify Hadoop 1/2

2014-03-28 Thread mdrob
ACCUMULO-2564 Backport changes to unify Hadoop 1/2 This is a backport of the changes made for Accumulo 1.5.0 and 1.5.1 to establish binary compatibility with both Hadoop 1 and 2 branches. This work was originally done under several commits and issues, as outlined below. Additionally, there was som

[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-03-28 Thread bhavanki
Merge branch '1.6.0-SNAPSHOT' Conflicts: server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a831aca2 Tree: http://git-wip-us.apache.

git commit: ACCUMULO-2455 1s timeout is too tight for testing

2014-03-28 Thread ecn
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT a20e19fc4 -> e5070d0ad ACCUMULO-2455 1s timeout is too tight for testing Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e5070d0a Tree: http://git-wip-

[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-03-28 Thread ecn
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/277da3f8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/277da3f8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/277da3

[1/2] git commit: ACCUMULO-2455 1s timeout is too tight for testing

2014-03-28 Thread ecn
Repository: accumulo Updated Branches: refs/heads/master 5655a044e -> 277da3f83 ACCUMULO-2455 1s timeout is too tight for testing Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e5070d0a Tree: http://git-wip-us.apach