[11/15] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

[busbey]

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
        
core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1ed463ea
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1ed463ea
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1ed463ea

Branch: refs/heads/master
Commit: 1ed463ea285a70cc0ec5ebdfcc7f92c75acf4f32
Parents: 0b79ee8 a65565b
Author: Sean Busbey <bus...@cloudera.com>
Authored: Wed Apr 16 12:56:54 2014 -0500
Committer: Sean Busbey <bus...@cloudera.com>
Committed: Tue Apr 22 15:11:28 2014 -0500

----------------------------------------------------------------------
 .../accumulo/core/file/rfile/CreateEmpty.java   | 81 ++++++++++++++++++++
 .../core/file/rfile/RFileOperations.java        |  6 +-
 2 files changed, 85 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ed463ea/core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java
----------------------------------------------------------------------
diff --cc 
core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java
index b361413,c906522..9fabe42
--- 
a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java
@@@ -119,9 -123,7 +123,7 @@@ public class RFileOperations extends Fi
      long blockSize = 
acuconf.getMemoryInBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE);
      long indexBlockSize = 
acuconf.getMemoryInBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX);
      
-     String compression = acuconf.get(Property.TABLE_FILE_COMPRESSION_TYPE);
-     
 -    CachableBlockFile.Writer _cbw = new 
CachableBlockFile.Writer(fs.create(new Path(file), false, bufferSize, (short) 
rep, block), compression, conf);
 +    CachableBlockFile.Writer _cbw = new 
CachableBlockFile.Writer(fs.create(new Path(file), false, bufferSize, (short) 
rep, block), compression, conf, acuconf);
      Writer writer = new RFile.Writer(_cbw, (int) blockSize, (int) 
indexBlockSize);
      return writer;
    }