Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b7f60e5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b7f60e5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b7f60e5 Branch: refs/heads/master Commit: 9b7f60e5dd059f120cb22287245bff14733608ec Parents: 8949e3d a8d1acd Author: Josh Elser <els...@apache.org> Authored: Thu Jul 14 14:55:30 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jul 14 14:55:30 2016 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/file/rfile/bcfile/Compression.java | 3 +-- .../apache/accumulo/core/file/rfile/bcfile/CompressionTest.java | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b7f60e5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b7f60e5/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java ----------------------------------------------------------------------
