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/ffb5be41 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ffb5be41 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ffb5be41 Branch: refs/heads/master Commit: ffb5be4123c479d0b3aabd8dabb108cccf92bdf6 Parents: d664254 9b7f60e Author: Josh Elser <els...@apache.org> Authored: Thu Jul 14 15:11:37 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jul 14 15:11:37 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/ffb5be41/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java ----------------------------------------------------------------------
