[2/2] accumulo git commit: Merge branch 'ACC-4153' into 1.6

Merge branch 'ACC-4153' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c5ac9f3b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c5ac9f3b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c5a

[5/5] accumulo git commit: Merge branch '1.8'

Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae7a6ecc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ae7a6ecc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ae7a6ecc Branch:

[4/5] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/512a25fc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/512a25fc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/512a25fc

[2/5] accumulo git commit: Merge branch 'ACC-4153' into 1.6

Merge branch 'ACC-4153' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c5ac9f3b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c5ac9f3b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c5a

[3/5] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d26943e Tree: http://git-wip-us.apache.org/

[1/5] accumulo git commit: ACCUMULO-4153: Remove synchronization from Compression

Repository: accumulo Updated Branches: refs/heads/master dfc113aec -> ae7a6ecc0 ACCUMULO-4153: Remove synchronization from Compression Update the getCodec method to no longer be synchronized using static initializer in enum Update so that we use a codec cache if we are not using the default b

[3/4] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d26943e Tree: http://git-wip-us.apache.org/

[1/4] accumulo git commit: ACCUMULO-4153: Remove synchronization from Compression

Repository: accumulo Updated Branches: refs/heads/1.8 f4d4f577d -> 512a25fc8 ACCUMULO-4153: Remove synchronization from Compression Update the getCodec method to no longer be synchronized using static initializer in enum Update so that we use a codec cache if we are not using the default buff

[4/4] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/512a25fc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/512a25fc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/512a25fc

[2/4] accumulo git commit: Merge branch 'ACC-4153' into 1.6

Merge branch 'ACC-4153' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c5ac9f3b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c5ac9f3b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c5a

[2/3] accumulo git commit: Merge branch 'ACC-4153' into 1.6

Merge branch 'ACC-4153' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c5ac9f3b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c5ac9f3b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c5a

[3/3] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d26943e Tree: http://git-wip-us.apache.org/

[1/3] accumulo git commit: ACCUMULO-4153: Remove synchronization from Compression

Repository: accumulo Updated Branches: refs/heads/1.7 dffb1c5a9 -> 4d26943e5 ACCUMULO-4153: Remove synchronization from Compression Update the getCodec method to no longer be synchronized using static initializer in enum Update so that we use a codec cache if we are not using the default buff

[1/2] accumulo git commit: ACCUMULO-4153: Remove synchronization from Compression

Repository: accumulo Updated Branches: refs/heads/1.6 6d85034c4 -> c5ac9f3b5 ACCUMULO-4153: Remove synchronization from Compression Update the getCodec method to no longer be synchronized using static initializer in enum Update so that we use a codec cache if we are not using the default buff