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

2014-01-23 Thread kturner
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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/699150

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

2014-01-23 Thread kturner
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: http://git-wip-us.apach

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

2014-01-23 Thread kturner
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: http://git-wip-

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/r

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumul

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumulo/commit

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/r

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

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

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

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

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40ef5d

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40ef5d

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

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

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

2014-01-23 Thread elserj
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 core/src/main/java/org/apache/accumulo/core/client/m

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

2014-01-23 Thread elserj
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

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

2014-01-23 Thread elserj
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 ours

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

2014-01-23 Thread elserj
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 test/src/main/java/org/apache/accumulo/test/continuo

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

2014-01-23 Thread elserj
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 ours

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

2014-01-23 Thread elserj
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 i

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

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

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

2014-01-23 Thread elserj
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 core/src/main/java/org/apache/accumulo/core/client/m

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

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

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

2014-01-23 Thread elserj
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 test/src/main/java/org/apache/accumulo/test/continuo

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

2014-01-23 Thread elserj
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 src/serve

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

2014-01-23 Thread elserj
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 i

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

2014-01-23 Thread elserj
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 ours

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

2014-01-23 Thread elserj
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 src/serve

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

2014-01-23 Thread elserj
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 i

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

2014-01-23 Thread elserj
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 test/src/main/java/org/apache/accumulo/test/continuo

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

2014-01-23 Thread elserj
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 ours

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

2014-01-23 Thread elserj
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 src/serve

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

2014-01-23 Thread ctubbsii
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 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/comm

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

2014-01-23 Thread mdrob
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/ - copie

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

2014-01-23 Thread mdrob
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: http://svn.apache.org/vi

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

2014-01-23 Thread buildbot
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: websites/staging/accumulo/trunk/

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

2014-01-23 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java test/src/main/java/org/apache/accumulo/test/conti

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0

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

2014-01-23 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java test/src/main/java/org/apache/accumulo/test/conti

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumu

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumu

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

2014-01-23 Thread elserj
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: http://git-wip-

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumulo/t

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumulo/t

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumu

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumu

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumu

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

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

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/accumu

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

2014-01-23 Thread elserj
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: http://git-wip-us.apache.org/repos/asf/acc

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

2014-01-23 Thread kturner
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: http://git-wip-us.apache.org/repos/asf/

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

2014-01-23 Thread kturner
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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/949619

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

2014-01-23 Thread kturner
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: http://git-wip-us.apache.org/repos/asf/

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

2014-01-23 Thread kturner
Updated Branches: refs/heads/master 353badb05 -> 9496199d0 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/de7

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

2014-01-23 Thread kturner
ACCUMULO-2154 Ignore NoNodeException while getting DeadServerList Signed-off-by: Keith Turner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ecdd8528 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ecdd8528

git commit: ACCUMULO-2154 Ignore NoNodeException while getting DeadServerList

2014-01-23 Thread kturner
Updated Branches: refs/heads/1.6.0-SNAPSHOT 182f15260 -> ecdd8528d ACCUMULO-2154 Ignore NoNodeException while getting DeadServerList Signed-off-by: Keith Turner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ecdd8

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

2014-01-23 Thread mdrob
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: http://git-wip-us.apache.org/repos/asf/accumulo/dif

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

2014-01-23 Thread mdrob
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: http://git-wip-u

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

2014-01-23 Thread mdrob
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: http://git-wip-us.apache.org/repos/asf/

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

2014-01-23 Thread mdrob
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: http://git-wip-us.apache.org/repos/asf/accumulo/dif

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

2014-01-23 Thread mdrob
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: http://git-wip-us.apache.org/repos/asf/

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

2014-01-23 Thread mdrob
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: http://git-wip-us.apache.org/repos/asf/