[04/10] Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d54e0fd8/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java -- diff --cc

[01/10] git commit: ACCUMULO-1628 Fixes issue after previous changes which interrupted a deep-copy

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT c335fca72 - 7699e1f43 refs/heads/1.6.1-SNAPSHOT 0d76cd520 - d54e0fd86 refs/heads/master abf966e19 - 6b5275e1b ACCUMULO-1628 Fixes issue after previous changes which interrupted a deep-copy Pushes the interrupt flag from the

[07/10] Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d54e0fd8/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java -- diff --cc

[10/10] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[03/10] git commit: ACCUMULO-1628 Fixes issue after previous changes which interrupted a deep-copy

ACCUMULO-1628 Fixes issue after previous changes which interrupted a deep-copy Pushes the interrupt flag from the SourceSwitchingIterator down to the FileManager and InMemoryMap. This should avoid passing the interrupt into a deep copy which isn't supported. Adds some more tests which previously

[09/10] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[05/10] Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d54e0fd8/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java index

[02/10] git commit: ACCUMULO-1628 Fixes issue after previous changes which interrupted a deep-copy

ACCUMULO-1628 Fixes issue after previous changes which interrupted a deep-copy Pushes the interrupt flag from the SourceSwitchingIterator down to the FileManager and InMemoryMap. This should avoid passing the interrupt into a deep copy which isn't supported. Adds some more tests which previously

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

Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25ab9c64 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25ab9c64 Diff:

[2/3] git commit: ACCUMULO-3113 Increase the timeouts in testTimeout

ACCUMULO-3113 Increase the timeouts in testTimeout Formatting also got fixed by eclipse. Should help stabilize some failures that I was seeing from this test. It appears that 1 second was slightly too fast in some cases to get the cond mutation committed. Project:

[1/3] git commit: ACCUMULO-3113 Increase the timeouts in testTimeout

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT d54e0fd86 - 2519b838e refs/heads/master 6b5275e1b - 25ab9c645 ACCUMULO-3113 Increase the timeouts in testTimeout Formatting also got fixed by eclipse. Should help stabilize some failures that I was seeing from this test. It

git commit: ACCUMULO-2645 remove warnings (unused import)

Repository: accumulo Updated Branches: refs/heads/master 25ab9c645 - d9e96d0c1 ACCUMULO-2645 remove warnings (unused import) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d9e96d0c Tree:

git commit: ACCUMULO-3116 increase the max split size so the test runs

Repository: accumulo Updated Branches: refs/heads/master d9e96d0c1 - a05c96d81 ACCUMULO-3116 increase the max split size so the test runs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a05c96d8 Tree:

[1/2] git commit: ACCUMULO-2841 Add Arbitrary Table Properties

Repository: accumulo Updated Branches: refs/heads/master a05c96d81 - 117d5c5c8 ACCUMULO-2841 Add Arbitrary Table Properties Signed-off-by: Christopher Tubbs ctubb...@apache.org Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[2/2] git commit: ACCUMULO-2841 Change test to use default timeout and SimpleMacIT

ACCUMULO-2841 Change test to use default timeout and SimpleMacIT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/117d5c5c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/117d5c5c Diff:

svn commit: r1624634 - /accumulo/site/trunk/content/people.mdtext

Author: ctubbsii Date: Fri Sep 12 20:14:14 2014 New Revision: 1624634 URL: http://svn.apache.org/r1624634 Log: Add contributor to people list Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL:

svn commit: r922000 - in /websites/staging/accumulo/trunk/content: ./ people.html

Author: buildbot Date: Fri Sep 12 20:14:28 2014 New Revision: 922000 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/people.html Propchange: websites/staging/accumulo/trunk/content/

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

Author: ctubbsii Date: Fri Sep 12 20:16:00 2014 New Revision: 922001 Log: Publishing svnmucc operation to accumulo site by ctubbsii Added: websites/production/accumulo/content/ - copied from r922000, websites/staging/accumulo/trunk/content/

[16/16] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java

[14/16] git commit: ACCUMULO-3119 Cleanup javadocs in 1.6.x branch

ACCUMULO-3119 Cleanup javadocs in 1.6.x branch Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3e17f45 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3e17f45 Diff:

[03/16] git commit: ACCUMULO-3119 Cleanup javadocs in 1.5.x branch

ACCUMULO-3119 Cleanup javadocs in 1.5.x branch Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b56159c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b56159c Diff:

[07/16] git commit: ACCUMULO-3093 Remove unused import

ACCUMULO-3093 Remove unused import Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f64482bf Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f64482bf Diff:

[15/16] git commit: ACCUMULO-3119 Cleanup javadocs in 1.6.x branch

ACCUMULO-3119 Cleanup javadocs in 1.6.x branch Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3e17f45 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3e17f45 Diff:

[04/16] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d8a4def0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d8a4def0 Diff:

[02/16] git commit: ACCUMULO-3119 Cleanup javadocs in 1.5.x branch

ACCUMULO-3119 Cleanup javadocs in 1.5.x branch Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b56159c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b56159c Diff:

[01/16] git commit: ACCUMULO-3119 Cleanup javadocs in 1.5.x branch

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 7699e1f43 - 9b56159c1 refs/heads/1.6.1-SNAPSHOT 2519b838e - d3e17f458 refs/heads/master 117d5c5c8 - 541a77ff7 ACCUMULO-3119 Cleanup javadocs in 1.5.x branch Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo

[13/16] git commit: ACCUMULO-2645 Remove unused imports

ACCUMULO-2645 Remove unused imports Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d23cb34e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d23cb34e Diff:

[05/16] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d8a4def0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d8a4def0 Diff:

[12/16] git commit: ACCUMULO-3078 Fix ConditionalWriterIT trace test

ACCUMULO-3078 Fix ConditionalWriterIT trace test Discovered by dead code warning. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/22de8d52 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/22de8d52 Diff:

[11/16] git commit: ACCUMULO-3093 Remove unused import

ACCUMULO-3093 Remove unused import Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f64482bf Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f64482bf Diff:

[10/16] git commit: ACCUMULO-3078 Re-introduce warnings suppression for Job()

ACCUMULO-3078 Re-introduce warnings suppression for Job() Adds warning suppression needed to build against the Hadoop version declared as a dependency, by default. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[08/16] git commit: ACCUMULO-2645 Remove unused imports

ACCUMULO-2645 Remove unused imports Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d23cb34e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d23cb34e Diff:

[06/16] git commit: ACCUMULO-3078 Re-introduce warnings suppression for Job()

ACCUMULO-3078 Re-introduce warnings suppression for Job() Adds warning suppression needed to build against the Hadoop version declared as a dependency, by default. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[09/16] git commit: ACCUMULO-3078 Fix ConditionalWriterIT trace test

ACCUMULO-3078 Fix ConditionalWriterIT trace test Discovered by dead code warning. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/22de8d52 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/22de8d52 Diff:

[1/6] git commit: ACCUMULO-3120 Replacing references to docs/config.html to the Configuration Management portion of the user manual.

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 9b56159c1 - cee126f73 refs/heads/1.6.1-SNAPSHOT d3e17f458 - 939ed96bb refs/heads/master 541a77ff7 - 782c22ac7 ACCUMULO-3120 Replacing references to docs/config.html to the Configuration Management portion of the user manual.

[2/6] git commit: ACCUMULO-3120 Replacing references to docs/config.html to the Configuration Management portion of the user manual.

ACCUMULO-3120 Replacing references to docs/config.html to the Configuration Management portion of the user manual. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cee126f7 Tree:

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/939ed96b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/939ed96b Diff:

[3/6] git commit: ACCUMULO-3120 Replacing references to docs/config.html to the Configuration Management portion of the user manual.

ACCUMULO-3120 Replacing references to docs/config.html to the Configuration Management portion of the user manual. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cee126f7 Tree:

[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/939ed96b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/939ed96b Diff:

[6/6] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/782c22ac Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/782c22ac Diff: