[4/6] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

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/fbed7afa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fbed7afa Diff:

[2/6] git commit: ACCUMULO-2224 link TODOs to new JIRAs

ACCUMULO-2224 link TODOs to new JIRAs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/de7d1984 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de7d1984 Diff:

[1/6] git commit: ACCUMULO-2224 link TODOs to new JIRAs

Updated Branches: refs/heads/1.4.5-SNAPSHOT f778dcf50 - de7d19845 refs/heads/1.5.1-SNAPSHOT c4cd3b1bc - fbed7afab refs/heads/1.6.0-SNAPSHOT e7e5c0097 - 182f15260 ACCUMULO-2224 link TODOs to new JIRAs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[3/6] git commit: ACCUMULO-2224 link TODOs to new JIRAs

ACCUMULO-2224 link TODOs to new JIRAs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/de7d1984 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de7d1984 Diff:

[5/6] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

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/fbed7afa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fbed7afa Diff:

git commit: ACCUMULO-2154 Ignore NoNodeException while getting DeadServerList

Updated Branches: refs/heads/1.6.0-SNAPSHOT 182f15260 - ecdd8528d ACCUMULO-2154 Ignore NoNodeException while getting DeadServerList Signed-off-by: Keith Turner ktur...@apache.org Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[4/5] git commit: ACCUMULO-2154 Ignore NoNodeException while getting DeadServerList

ACCUMULO-2154 Ignore NoNodeException while getting DeadServerList Signed-off-by: Keith Turner ktur...@apache.org Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ecdd8528 Tree:

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

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/9496199d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9496199d Diff:

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

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/182f1526 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/182f1526 Diff:

[2/5] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

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/fbed7afa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fbed7afa Diff:

git commit: ACCUMULO-2234 Fix up formatting for madrob.

Updated Branches: refs/heads/1.4.5-SNAPSHOT de7d19845 - 9cf94f936 ACCUMULO-2234 Fix up formatting for madrob. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9cf94f93 Tree:

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

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/88a9b53d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/88a9b53d Diff:

[05/15] git commit: ACCUMULO-2234 Fix up formatting for madrob.

ACCUMULO-2234 Fix up formatting for madrob. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9cf94f93 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9cf94f93 Diff:

[06/15] git commit: ACCUMULO-2234 Fix up formatting for madrob.

ACCUMULO-2234 Fix up formatting for madrob. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9cf94f93 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9cf94f93 Diff:

[01/15] git commit: ACCUMULO-2183 Look for the thrift SecurityErrorCode since this is coming from the ThriftSecurityException.

Updated Branches: refs/heads/1.5.1-SNAPSHOT fbed7afab - a147acdd6 refs/heads/1.6.0-SNAPSHOT ecdd8528d - 9440d15cb refs/heads/master 9496199d0 - 88a9b53d6 ACCUMULO-2183 Look for the thrift SecurityErrorCode since this is coming from the ThriftSecurityException. Project:

[10/15] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java Project:

[11/15] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java Project:

[02/15] git commit: ACCUMULO-2183 Look for the thrift SecurityErrorCode since this is coming from the ThriftSecurityException.

ACCUMULO-2183 Look for the thrift SecurityErrorCode since this is coming from the ThriftSecurityException. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/956c32f8 Tree:

[07/15] git commit: ACCUMULO-2235 Fix up formatter for madrob and make the du test a little less sensitive to other tests

ACCUMULO-2235 Fix up formatter for madrob and make the du test a little less sensitive to other tests Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/00bd820e Tree:

svn commit: r1560781 - /accumulo/site/trunk/content/downloads/index.mdtext

Author: mdrob Date: Thu Jan 23 18:51:28 2014 New Revision: 1560781 URL: http://svn.apache.org/r1560781 Log: Update 1.5 README link for git. Modified: accumulo/site/trunk/content/downloads/index.mdtext Modified: accumulo/site/trunk/content/downloads/index.mdtext URL:

svn commit: r895248 - in /websites/staging/accumulo/trunk/content: ./ downloads/index.html

Author: buildbot Date: Thu Jan 23 18:51:47 2014 New Revision: 895248 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/downloads/index.html Propchange:

svn commit: r895249 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/

Author: mdrob Date: Thu Jan 23 18:52:11 2014 New Revision: 895249 Log: Update 1.5 README link from svn to git. Added: websites/production/accumulo/content/ - copied from r895248, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ -

git commit: ACCUMULO-2196 ConfigurableMacIT tests should each use their own dirs

Updated Branches: refs/heads/1.6.0-SNAPSHOT 9440d15cb - e36ac378d ACCUMULO-2196 ConfigurableMacIT tests should each use their own dirs Signed-off-by: Christopher Tubbs ctubb...@apache.org Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[09/21] git commit: ACCUMULO-2234 Replace usages of Instance.getConfiguration with the server-side configuration

ACCUMULO-2234 Replace usages of Instance.getConfiguration with the server-side configuration Pull the site configuration from instanceOperations off of the Connector which gives us access to the accumulo-site.xml file being used by that instance and alleviates the need for us to provide it

[03/21] git commit: Revert ACCUMULO-2234 Provide accumulo-site.xml to Mapper classpath and ensure is used by concrete Instance.

Revert ACCUMULO-2234 Provide accumulo-site.xml to Mapper classpath and ensure is used by concrete Instance. This reverts commit 57f9b6cfd30b1b2505efbacd2a5ce391dbcd1e0c. Conflicts: src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java

[05/21] git commit: ACCUMULO-2196 ConfigurableMacIT tests should each use their own dirs

ACCUMULO-2196 ConfigurableMacIT tests should each use their own dirs Signed-off-by: Christopher Tubbs ctubb...@apache.org Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e36ac378 Tree:

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

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/c98c0927 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c98c0927 Diff:

[04/21] git commit: Revert ACCUMULO-2234 Provide accumulo-site.xml to Mapper classpath and ensure is used by concrete Instance.

Revert ACCUMULO-2234 Provide accumulo-site.xml to Mapper classpath and ensure is used by concrete Instance. This reverts commit 57f9b6cfd30b1b2505efbacd2a5ce391dbcd1e0c. Conflicts: src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java

[13/21] Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/accumulo/blob/23bb4321/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java -- diff --cc test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java

[06/21] git commit: ACCUMULO-2234 Replace usages of Instance.getConfiguration with the server-side configuration

ACCUMULO-2234 Replace usages of Instance.getConfiguration with the server-side configuration Pull the site configuration from instanceOperations off of the Connector which gives us access to the accumulo-site.xml file being used by that instance and alleviates the need for us to provide it

[01/21] git commit: Revert ACCUMULO-2234 Provide accumulo-site.xml to Mapper classpath and ensure is used by concrete Instance.

Updated Branches: refs/heads/1.4.5-SNAPSHOT 9cf94f936 - 36cec4f33 refs/heads/1.5.1-SNAPSHOT a147acdd6 - 23bb43210 refs/heads/1.6.0-SNAPSHOT e36ac378d - 27be9fb07 refs/heads/master 88a9b53d6 - c98c09275 Revert ACCUMULO-2234 Provide accumulo-site.xml to Mapper classpath and ensure is used

[07/21] git commit: ACCUMULO-2234 Replace usages of Instance.getConfiguration with the server-side configuration

ACCUMULO-2234 Replace usages of Instance.getConfiguration with the server-side configuration Pull the site configuration from instanceOperations off of the Connector which gives us access to the accumulo-site.xml file being used by that instance and alleviates the need for us to provide it

[12/21] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java

[08/21] git commit: ACCUMULO-2234 Replace usages of Instance.getConfiguration with the server-side configuration

ACCUMULO-2234 Replace usages of Instance.getConfiguration with the server-side configuration Pull the site configuration from instanceOperations off of the Connector which gives us access to the accumulo-site.xml file being used by that instance and alleviates the need for us to provide it

[8/9] git commit: ACCUMULO-2234 Remove the hardcoded tables dir and put it with the rest of the constants in core.

ACCUMULO-2234 Remove the hardcoded tables dir and put it with the rest of the constants in core. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40ef5d42 Tree:

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

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/028b3c51 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/028b3c51 Diff:

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

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/129deb7e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/129deb7e Diff:

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

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/028b3c51 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/028b3c51 Diff:

[1/9] git commit: ACCUMULO-2234 Remove a no longer relevant javadoc message.

Updated Branches: refs/heads/1.6.0-SNAPSHOT 27be9fb07 - 40ef5d426 refs/heads/master c98c09275 - 129deb7ef ACCUMULO-2234 Remove a no longer relevant javadoc message. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[2/9] git commit: ACCUMULO-2234 Remove a no longer relevant javadoc message.

ACCUMULO-2234 Remove a no longer relevant javadoc message. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6d6ca9d9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6d6ca9d9 Diff:

[2/3] git commit: ACCUMULO-2234 Remove a no longer relevant javadoc message.

ACCUMULO-2234 Remove a no longer relevant javadoc message. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6d6ca9d9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6d6ca9d9 Diff:

[1/3] git commit: ACCUMULO-2234 Remove a no longer relevant javadoc message.

Updated Branches: refs/heads/1.4.5-SNAPSHOT 36cec4f33 - 6d6ca9d9e refs/heads/1.5.1-SNAPSHOT 23bb43210 - 59680b32d ACCUMULO-2234 Remove a no longer relevant javadoc message. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

git commit: ACCUMULO-1832 require all volumes to have same instance id and version

Updated Branches: refs/heads/1.6.0-SNAPSHOT 40ef5d426 - 11d803cf1 ACCUMULO-1832 require all volumes to have same instance id and version Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/11d803cf Tree:

[1/2] git commit: ACCUMULO-1832 require all volumes to have same instance id and version

Updated Branches: refs/heads/master 129deb7ef - 6991509cc ACCUMULO-1832 require all volumes to have same instance id and version Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/11d803cf Tree:

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

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/6991509c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6991509c Diff: