[04/48] git commit: ACCUMULO-2292 Fix a potential bug in the InputFormat that I introduced.

ACCUMULO-2292 Fix a potential bug in the InputFormat that I introduced. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f4c5005 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f4c5005 Diff:

[34/48] Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7688eaf0/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java

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

Updated Branches: refs/heads/1.5.1-SNAPSHOT 01cb31038 - b11a03615 refs/heads/1.6.0-SNAPSHOT 2a8e146e9 - 7688eaf0b refs/heads/master 5aef9aeec - e03be58a7 Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Project:

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

Merge branch '1.6.0-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java core/src/main/java/org/apache/accumulo/core/data/KeyValue.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[20/48] Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7688eaf0/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java

[02/48] git commit: ACCUMULO-2292 Fix a potential bug in the InputFormat that I introduced.

ACCUMULO-2292 Fix a potential bug in the InputFormat that I introduced. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f4c5005 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f4c5005 Diff:

git commit: ACCUMULO-2273 Use guava's Joiner instead of writing our own

Updated Branches: refs/heads/master e03be58a7 - 7a4886c44 ACCUMULO-2273 Use guava's Joiner instead of writing our own Signed-off-by: Bill Havanki bhava...@cloudera.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

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

[5/6] 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: CHANGES Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a9d1b13e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9d1b13e Diff:

[3/6] git commit: ACCUMULO-2170 Update CHANGES for 1.5.1 from jira.

ACCUMULO-2170 Update CHANGES for 1.5.1 from jira. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d277321d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d277321d Diff:

[4/6] 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: CHANGES Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a9d1b13e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9d1b13e Diff:

[1/6] git commit: ACCUMULO-2170 Update CHANGES for 1.5.1 from jira.

Updated Branches: refs/heads/1.5.1-SNAPSHOT b11a03615 - d277321d1 refs/heads/1.6.0-SNAPSHOT 7688eaf0b - a9d1b13e7 refs/heads/master 7a4886c44 - ba494bdb1 ACCUMULO-2170 Update CHANGES for 1.5.1 from jira. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[2/6] git commit: ACCUMULO-2170 Update CHANGES for 1.5.1 from jira.

ACCUMULO-2170 Update CHANGES for 1.5.1 from jira. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d277321d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d277321d Diff:

[2/2] git commit: ACCUMULO-1930 Adding StatsCombiner and Classpath test

ACCUMULO-1930 Adding StatsCombiner and Classpath test Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/482f570c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/482f570c Diff:

[1/3] git commit: ACCUMULO-2317 fixing shell

Updated Branches: refs/heads/master ba494bdb1 - b05d459b9 ACCUMULO-2317 fixing shell Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43bf128e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43bf128e Diff:

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

Merge remote-tracking branch 'origin/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/b05d459b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b05d459b Diff:

[2/3] git commit: ACCUMULO-1930 Adding StatsCombiner and Classpath test

ACCUMULO-1930 Adding StatsCombiner and Classpath test Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/482f570c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/482f570c Diff:

git commit: ACCUMULO-2060 Jars which are expected to be reloaded should go in lib/ext, not lib

Updated Branches: refs/heads/1.6.0-SNAPSHOT 43bf128e4 - 55e864ce9 ACCUMULO-2060 Jars which are expected to be reloaded should go in lib/ext, not lib Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/55e864ce Tree:

git commit: ACCUMULO-2283 removing server-extras

Updated Branches: refs/heads/1.6.0-SNAPSHOT 55e864ce9 - 4e331fabd ACCUMULO-2283 removing server-extras Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4e331fab Tree:

git commit: ACCUMULO-2114 Starting a Constants reference for clients

Updated Branches: refs/heads/1.6.0-SNAPSHOT 4e331fabd - 26c51db4d ACCUMULO-2114 Starting a Constants reference for clients Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/26c51db4 Tree:

git commit: ACCUMULO-1948 Tablet constructor no longer leaks this

Updated Branches: refs/heads/master b05d459b9 - eade3b59d ACCUMULO-1948 Tablet constructor no longer leaks this The core Tablet constructor no longer sets this on the TabletResourceManager passed to it. The TabletResourceManager instance is created now without a Tablet reference, but only

Git Push Summary

Updated Branches: refs/heads/2292-findbugs [deleted] 4a78265b3

git commit: ACCUMULO-2322 Tablet constructor no longer leaks this to recovery process

Updated Branches: refs/heads/master eade3b59d - 47cdb9227 ACCUMULO-2322 Tablet constructor no longer leaks this to recovery process The method signatures for TabletServer.recover() and TabletServerLogger.recover() were modified so that the Tablet constructor no longer needs to pass this.

[10/10] git commit: ACCUMULO-2197 provide generated proxy libraries, with modified generate-thrift script which tacks on headers

ACCUMULO-2197 provide generated proxy libraries, with modified generate-thrift script which tacks on headers Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d436e7b Tree:

[07/10] ACCUMULO-2197 provide generated proxy libraries, with modified generate-thrift script which tacks on headers

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d436e7b/proxy/src/main/cpp/AccumuloProxy_server.skeleton.cpp -- diff --git a/proxy/src/main/cpp/AccumuloProxy_server.skeleton.cpp

[15/17] ACCUMULO-2197 updating files for this version

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3298263a/proxy/src/main/cpp/AccumuloProxy.h -- diff --git a/proxy/src/main/cpp/AccumuloProxy.h b/proxy/src/main/cpp/AccumuloProxy.h index d747d3a..6a5db22 100644 ---

[11/17] 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/49b8ffed Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/49b8ffed Diff:

[10/17] git commit: ACCUMULO-2197 provide generated proxy libraries, with modified generate-thrift script which tacks on headers

ACCUMULO-2197 provide generated proxy libraries, with modified generate-thrift script which tacks on headers Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d436e7b Tree:

[01/10] ACCUMULO-2197 provide generated proxy libraries, with modified generate-thrift script which tacks on headers

Updated Branches: refs/heads/1.5.1-SNAPSHOT d277321d1 - 3d436e7bd http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d436e7b/proxy/src/main/ruby/proxy_constants.rb -- diff --git a/proxy/src/main/ruby/proxy_constants.rb

[14/17] ACCUMULO-2197 updating files for this version

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3298263a/proxy/src/main/cpp/proxy_types.cpp -- diff --git a/proxy/src/main/cpp/proxy_types.cpp b/proxy/src/main/cpp/proxy_types.cpp index 8473802..54694bb 100644 ---

[12/17] ACCUMULO-2197 updating files for this version

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3298263a/proxy/src/main/python/ttypes.py -- diff --git a/proxy/src/main/python/ttypes.py b/proxy/src/main/python/ttypes.py index 41f684d..2ec3346 100644 ---

[07/17] ACCUMULO-2197 provide generated proxy libraries, with modified generate-thrift script which tacks on headers

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d436e7b/proxy/src/main/cpp/AccumuloProxy_server.skeleton.cpp -- diff --git a/proxy/src/main/cpp/AccumuloProxy_server.skeleton.cpp

git commit: ACCUMULO-2283 missed a reference

Updated Branches: refs/heads/1.6.0-SNAPSHOT 3298263a7 - ccffeeeb5 ACCUMULO-2283 missed a reference Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ccffeeeb Tree:

[17/17] git commit: ACCUMULO-2197 updating files for this version

ACCUMULO-2197 updating files for this version Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3298263a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3298263a Diff:

[01/17] ACCUMULO-2197 provide generated proxy libraries, with modified generate-thrift script which tacks on headers

Updated Branches: refs/heads/1.6.0-SNAPSHOT 26c51db4d - 3298263a7 http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d436e7b/proxy/src/main/ruby/proxy_constants.rb -- diff --git a/proxy/src/main/ruby/proxy_constants.rb

git commit: ACCUMULO-2197 updating assembly for new locations

Updated Branches: refs/heads/1.5.1-SNAPSHOT 3d436e7bd - 9ff6eea41 ACCUMULO-2197 updating assembly for new locations Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9ff6eea4 Tree:

[1/2] git commit: ACCUMULO-2197 updating assembly for new locations

Updated Branches: refs/heads/1.6.0-SNAPSHOT ccffeeeb5 - 279024fe9 ACCUMULO-2197 updating assembly for new locations Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9ff6eea4 Tree:

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

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: assemble/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/279024fe Tree:

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

Merge branch '1.6.0-SNAPSHOT' Conflicts: server/extras/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/76770082 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/76770082 Diff:

[20/29] git commit: ACCUMULO-2197 updating files for this version

ACCUMULO-2197 updating files for this version Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3298263a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3298263a Diff:

[04/29] ACCUMULO-2197 provide generated proxy libraries, with modified generate-thrift script which tacks on headers

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d436e7b/proxy/src/main/ruby/proxy_constants.rb -- diff --git a/proxy/src/main/ruby/proxy_constants.rb b/proxy/src/main/ruby/proxy_constants.rb new file mode 100644 index

[25/29] git commit: ACCUMULO-2170 Add in a tag element to the scm block

ACCUMULO-2170 Add in a tag element to the scm block The release plugin will add in the tag elemen when it's not present, by appending it to the last child in the scm element. This creates a non-sorted pom, which sortpom will fail the build over. Adding in a tag with a stub value will at least let

[22/29] git commit: ACCUMULO-2197 updating assembly for new locations

ACCUMULO-2197 updating assembly for new locations Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9ff6eea4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9ff6eea4 Diff:

[24/29] git commit: ACCUMULO-2170 Add in a tag element to the scm block

ACCUMULO-2170 Add in a tag element to the scm block The release plugin will add in the tag elemen when it's not present, by appending it to the last child in the scm element. This creates a non-sorted pom, which sortpom will fail the build over. Adding in a tag with a stub value will at least let

[17/29] ACCUMULO-2197 updating files for this version

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3298263a/proxy/src/main/cpp/proxy_types.cpp -- diff --git a/proxy/src/main/cpp/proxy_types.cpp b/proxy/src/main/cpp/proxy_types.cpp index 8473802..54694bb 100644 ---

[18/29] ACCUMULO-2197 updating files for this version

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3298263a/proxy/src/main/cpp/AccumuloProxy.h -- diff --git a/proxy/src/main/cpp/AccumuloProxy.h b/proxy/src/main/cpp/AccumuloProxy.h index d747d3a..6a5db22 100644 ---

[03/29] git commit: ACCUMULO-2114 Starting a Constants reference for clients

ACCUMULO-2114 Starting a Constants reference for clients Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/26c51db4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/26c51db4 Diff:

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

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: assemble/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/279024fe Tree:

[13/29] git commit: ACCUMULO-2197 provide generated proxy libraries, with modified generate-thrift script which tacks on headers

ACCUMULO-2197 provide generated proxy libraries, with modified generate-thrift script which tacks on headers Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d436e7b Tree:

[01/29] git commit: ACCUMULO-2060 Jars which are expected to be reloaded should go in lib/ext, not lib

Updated Branches: refs/heads/1.5.1-SNAPSHOT 9ff6eea41 - 5eb19c675 refs/heads/1.6.0-SNAPSHOT 279024fe9 - a72dd7867 refs/heads/master 47cdb9227 - 767700827 ACCUMULO-2060 Jars which are expected to be reloaded should go in lib/ext, not lib Project:

[15/29] ACCUMULO-2197 updating files for this version

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3298263a/proxy/src/main/python/ttypes.py -- diff --git a/proxy/src/main/python/ttypes.py b/proxy/src/main/python/ttypes.py index 41f684d..2ec3346 100644 ---

[28/29] 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/a72dd786 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a72dd786 Diff:

[02/29] git commit: ACCUMULO-2283 removing server-extras

ACCUMULO-2283 removing server-extras Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4e331fab Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4e331fab Diff:

[21/29] git commit: ACCUMULO-2283 missed a reference

ACCUMULO-2283 missed a reference Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ccffeeeb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ccffeeeb Diff: