[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/

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

Merge branch '1.6' into 1.7 Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7f124337 Tree: http://git-wip-us.apache.org/repo

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java ind

[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/util/shell/commands/CompactCommand.java shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java shell/src/main/java/org/apache/accumulo/shell/commands/SetScanIterCommand.jav

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

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/d77863e0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d77863e0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d77863e0

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

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/5e2a06d0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e2a06d0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e2a06d0

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

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/18650ac6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18650ac6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18650ac6

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

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/312b8762 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/312b8762 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/312b8762