[1/2] git commit: ACCUMULO-1783 Update code to work with upstream 1.5 changes.

2013-11-23 Thread elserj
Updated Branches: refs/heads/ACCUMULO-1783-1.5 [created] cb720e850 ACCUMULO-1783 Update code to work with upstream 1.5 changes. Project: http://git-wip-us.apache.org/repos/asf/accumulo-pig/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-pig/commit/0ce6fb34 Tree: http://git-wip-us

[2/2] git commit: ACCUMULO-1783 Fix up 1.5 build

2013-11-23 Thread elserj
ACCUMULO-1783 Fix up 1.5 build Project: http://git-wip-us.apache.org/repos/asf/accumulo-pig/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-pig/commit/cb720e85 Tree: http://git-wip-us.apache.org/repos/asf/accumulo-pig/tree/cb720e85 Diff: http://git-wip-us.apache.org/repos/asf/accumul

[26/31] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-11-23 Thread elserj
Merge remote-tracking branch 'origin/1.5.1-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/10d26796 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/10d26796 Diff: http://git-wip-u

[24/31] git commit: ACCUMULO-1854 Add in missing license.

2013-11-23 Thread elserj
ACCUMULO-1854 Add in missing license. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6caa1597 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6caa1597 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/dif

[07/31] git commit: WIP Merge branch 'ACCUMULO-1854-merge' into ACCUMULO-1854-1.5-merge

2013-11-23 Thread elserj
WIP Merge branch 'ACCUMULO-1854-merge' into ACCUMULO-1854-1.5-merge Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java src/core/src/test/ja

[04/31] git commit: ACCUMULO-1914 make WALog cleanup after recovery an atomic mutation

2013-11-23 Thread elserj
ACCUMULO-1914 make WALog cleanup after recovery an atomic mutation Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7eaedc45 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7eaedc45 Diff: http://git-wip-us.apac

[18/31] git commit: ACCUMULO-1854 Remove todo and finish toString

2013-11-23 Thread elserj
ACCUMULO-1854 Remove todo and finish toString Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e1dd6f9b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e1dd6f9b Diff: http://git-wip-us.apache.org/repos/asf/accu

[29/31] git commit: ACCUMULO-1854 More missing licenses

2013-11-23 Thread elserj
ACCUMULO-1854 More missing licenses Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e6e1df41 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6e1df41 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/

[14/31] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into ACCUMULO-1854-1.5-merge

2013-11-23 Thread elserj
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into ACCUMULO-1854-1.5-merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f098247 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f098247 Diff: http:/

[28/31] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-11-23 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f3f93fd Tr

[27/31] git commit: ACCUMULO-1854 Update tests for hadoop-2 compatibility

2013-11-23 Thread elserj
ACCUMULO-1854 Update tests for hadoop-2 compatibility Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c88d87aa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c88d87aa Diff: http://git-wip-us.apache.org/repos/

[09/31] git commit: Merge branch 'ACCUMULO-1854-merge' into ACCUMULO-1854-1.5-merge

2013-11-23 Thread elserj
Merge branch 'ACCUMULO-1854-merge' into ACCUMULO-1854-1.5-merge Conflicts: src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4

[13/31] git commit: ACCUMULO-1854 Get the mapred package code working with the new approach as well.

2013-11-23 Thread elserj
ACCUMULO-1854 Get the mapred package code working with the new approach as well. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/03b065d2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/03b065d2 Diff: http://g

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

2013-11-23 Thread elserj
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/cf3e1fe7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf3e1fe7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf3e1f

[15/31] git commit: ACCUMULO-1854 Merge the mapred and mapreduce RangeInputSplits into one class

2013-11-23 Thread elserj
ACCUMULO-1854 Merge the mapred and mapreduce RangeInputSplits into one class Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67189202 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67189202 Diff: http://git-w

[20/31] git commit: Merge branch '1.4.5-SNAPSHOT' into ACCUMULO-1854-1.5-merge

2013-11-23 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into ACCUMULO-1854-1.5-merge Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java src/core/src/main/java/org/apache/accumulo/c

[11/31] git commit: ACCUMULO-1854 Get the mapreduce unit tests working again

2013-11-23 Thread elserj
ACCUMULO-1854 Get the mapreduce unit tests working again Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e08736d7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e08736d7 Diff: http://git-wip-us.apache.org/rep

[12/31] git commit: ACCUMULO-1854 Account for 1.4 to 1.5 changes in how Authorizations.serialize works.

2013-11-23 Thread elserj
ACCUMULO-1854 Account for 1.4 to 1.5 changes in how Authorizations.serialize works. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ef64992c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ef64992c Diff: http

[01/31] Squashed commit of the following:

2013-11-23 Thread elserj
Updated Branches: refs/heads/master e63d902fe -> cf3e1fe75 http://git-wip-us.apache.org/repos/asf/accumulo/blob/45ae55fc/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java -- diff --gi

[08/31] git commit: ACCUMULO-1854 Remove unnecessary arguments from methods

2013-11-23 Thread elserj
ACCUMULO-1854 Remove unnecessary arguments from methods Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3beb9f71 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3beb9f71 Diff: http://git-wip-us.apache.org/repo

[19/31] git commit: ACCUMULO-1854 Remove unnecessary arguments from methods

2013-11-23 Thread elserj
ACCUMULO-1854 Remove unnecessary arguments from methods Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8dd3ae4b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8dd3ae4b Diff: http://git-wip-us.apache.org/repo

[10/31] git commit: ACCUMULO-1854 Removing unnecessary configurations.

2013-11-23 Thread elserj
ACCUMULO-1854 Removing unnecessary configurations. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f4e4c39d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f4e4c39d Diff: http://git-wip-us.apache.org/repos/asf

[23/31] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.1-SNAPSHOT

2013-11-23 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java core/src/main/java/org/apache/accumulo/core/clien

[30/31] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-11-23 Thread elserj
Merge branch '1.5.1-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/7d24ff5b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d24ff5b Diff: http://git-wip-us.apache.org/repos/asf/

[03/31] git commit: ACCUMULO-1914 make WALog cleanup after recovery an atomic mutation

2013-11-23 Thread elserj
ACCUMULO-1914 make WALog cleanup after recovery an atomic mutation Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2640ea9d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2640ea9d Diff: http://git-wip-us.apac

[25/31] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-11-23 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fae82828 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fae82828 Diff: http://git-wip-us.apache.org/repos/asf/

[16/31] Squashed commit of the following:

2013-11-23 Thread elserj
http://git-wip-us.apache.org/repos/asf/accumulo/blob/73114819/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java -- diff --git a/src/core/src/test/java/org/apache/accumulo/core/client/map

[26/30] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-11-23 Thread elserj
Merge remote-tracking branch 'origin/1.5.1-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/10d26796 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/10d26796 Diff: http://git-wip-u

[04/30] git commit: ACCUMULO-1914 make WALog cleanup after recovery an atomic mutation

2013-11-23 Thread elserj
ACCUMULO-1914 make WALog cleanup after recovery an atomic mutation Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7eaedc45 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7eaedc45 Diff: http://git-wip-us.apac

[07/30] git commit: WIP Merge branch 'ACCUMULO-1854-merge' into ACCUMULO-1854-1.5-merge

2013-11-23 Thread elserj
WIP Merge branch 'ACCUMULO-1854-merge' into ACCUMULO-1854-1.5-merge Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java src/core/src/test/ja

[08/30] git commit: ACCUMULO-1854 Remove unnecessary arguments from methods

2013-11-23 Thread elserj
ACCUMULO-1854 Remove unnecessary arguments from methods Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3beb9f71 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3beb9f71 Diff: http://git-wip-us.apache.org/repo

[29/30] git commit: ACCUMULO-1854 More missing licenses

2013-11-23 Thread elserj
ACCUMULO-1854 More missing licenses Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e6e1df41 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6e1df41 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/

[25/30] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-11-23 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fae82828 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fae82828 Diff: http://git-wip-us.apache.org/repos/asf/

[18/30] git commit: ACCUMULO-1854 Remove todo and finish toString

2013-11-23 Thread elserj
ACCUMULO-1854 Remove todo and finish toString Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e1dd6f9b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e1dd6f9b Diff: http://git-wip-us.apache.org/repos/asf/accu

[15/30] git commit: ACCUMULO-1854 Merge the mapred and mapreduce RangeInputSplits into one class

2013-11-23 Thread elserj
ACCUMULO-1854 Merge the mapred and mapreduce RangeInputSplits into one class Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67189202 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67189202 Diff: http://git-w

[13/30] git commit: ACCUMULO-1854 Get the mapred package code working with the new approach as well.

2013-11-23 Thread elserj
ACCUMULO-1854 Get the mapred package code working with the new approach as well. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/03b065d2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/03b065d2 Diff: http://g

[24/30] git commit: ACCUMULO-1854 Add in missing license.

2013-11-23 Thread elserj
ACCUMULO-1854 Add in missing license. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6caa1597 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6caa1597 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/dif

[19/30] git commit: ACCUMULO-1854 Remove unnecessary arguments from methods

2013-11-23 Thread elserj
ACCUMULO-1854 Remove unnecessary arguments from methods Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8dd3ae4b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8dd3ae4b Diff: http://git-wip-us.apache.org/repo

[01/30] Squashed commit of the following:

2013-11-23 Thread elserj
Updated Branches: refs/heads/1.6.0-SNAPSHOT 7dd3592cd -> 7d24ff5b5 http://git-wip-us.apache.org/repos/asf/accumulo/blob/45ae55fc/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java -- d

[10/30] git commit: ACCUMULO-1854 Removing unnecessary configurations.

2013-11-23 Thread elserj
ACCUMULO-1854 Removing unnecessary configurations. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f4e4c39d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f4e4c39d Diff: http://git-wip-us.apache.org/repos/asf

[09/30] git commit: Merge branch 'ACCUMULO-1854-merge' into ACCUMULO-1854-1.5-merge

2013-11-23 Thread elserj
Merge branch 'ACCUMULO-1854-merge' into ACCUMULO-1854-1.5-merge Conflicts: src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4

[20/30] git commit: Merge branch '1.4.5-SNAPSHOT' into ACCUMULO-1854-1.5-merge

2013-11-23 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into ACCUMULO-1854-1.5-merge Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java src/core/src/main/java/org/apache/accumulo/c

[12/30] git commit: ACCUMULO-1854 Account for 1.4 to 1.5 changes in how Authorizations.serialize works.

2013-11-23 Thread elserj
ACCUMULO-1854 Account for 1.4 to 1.5 changes in how Authorizations.serialize works. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ef64992c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ef64992c Diff: http

[16/30] Squashed commit of the following:

2013-11-23 Thread elserj
http://git-wip-us.apache.org/repos/asf/accumulo/blob/73114819/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java -- diff --git a/src/core/src/test/java/org/apache/accumulo/core/client/map

[03/30] git commit: ACCUMULO-1914 make WALog cleanup after recovery an atomic mutation

2013-11-23 Thread elserj
ACCUMULO-1914 make WALog cleanup after recovery an atomic mutation Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2640ea9d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2640ea9d Diff: http://git-wip-us.apac

[28/30] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-11-23 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f3f93fd Tr

[27/30] git commit: ACCUMULO-1854 Update tests for hadoop-2 compatibility

2013-11-23 Thread elserj
ACCUMULO-1854 Update tests for hadoop-2 compatibility Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c88d87aa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c88d87aa Diff: http://git-wip-us.apache.org/repos/

[30/30] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-11-23 Thread elserj
Merge branch '1.5.1-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/7d24ff5b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d24ff5b Diff: http://git-wip-us.apache.org/repos/asf/

[14/30] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into ACCUMULO-1854-1.5-merge

2013-11-23 Thread elserj
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into ACCUMULO-1854-1.5-merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f098247 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f098247 Diff: http:/

[11/30] git commit: ACCUMULO-1854 Get the mapreduce unit tests working again

2013-11-23 Thread elserj
ACCUMULO-1854 Get the mapreduce unit tests working again Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e08736d7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e08736d7 Diff: http://git-wip-us.apache.org/rep

[23/30] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.1-SNAPSHOT

2013-11-23 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java core/src/main/java/org/apache/accumulo/core/clien

[1/2] git commit: ACCUMULO-1854 Update tests for hadoop-2 compatibility

2013-11-23 Thread elserj
Updated Branches: refs/heads/1.5.1-SNAPSHOT fae82828f -> e6e1df41a ACCUMULO-1854 Update tests for hadoop-2 compatibility Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c88d87aa Tree: http://git-wip-us.apache.org/rep

[2/2] git commit: ACCUMULO-1854 More missing licenses

2013-11-23 Thread elserj
ACCUMULO-1854 More missing licenses Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e6e1df41 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6e1df41 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/