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

Merge branch '1.6' into 1.7 Conflicts: server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java server/master/src/main/java/org/apache/accumulo/master/Master.java server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java server/tracer

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

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

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

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

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

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

Merge branch '1.6' Conflicts: docs/src/main/asciidoc/chapters/table_configuration.txt Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4fa6b421 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4fa6b421

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

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

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

Merge branch '1.6' Conflicts: server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/23f27828 Tree: http://git-wip-us.apache.org/repos/as

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Merge branch '1.6' Conflicts: assemble/pom.xml core/pom.xml docs/pom.xml examples/simple/pom.xml fate/pom.xml maven-plugin/pom.xml minicluster/pom.xml pom.xml proxy/pom.xml server/base/pom.xml server/gc/pom.xml

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

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

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

Merge branch '1.6' Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/be991c2a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be991c2a Diff: http://git-wip-us.apache.org/repos/asf/acc

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Merge branch '1.6' Conflicts: docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cd119099 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Merge branch '1.6' Merging with -sours for ACCUMULO-3405 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5bc1d080 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5bc1d080 Diff: http://git-wip-us.apache.org/

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

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

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

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

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

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

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

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

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

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

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

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

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

Merge branch '1.6' Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/923accb6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/923accb6 Diff: http://git-wip-us.apache.org/repos/asf/acc

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

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

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

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

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

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

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

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

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

Merge branch '1.6' Conflicts: docs/src/main/latex/accumulo_user_manual/chapters/administration.tex Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/27ab732d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/t

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

Merge branch '1.6' Conflicts: docs/src/main/latex/accumulo_user_manual/chapters/administration.tex Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7580952a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/t

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

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

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

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

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

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

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

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

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

Merge branch '1.6' 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/4062b343 Tree: http://git-wip-us.apache.org/repos/asf/acc

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

Merge branch '1.6' Conflicts: core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java core/src/test/java/org/apache/accumulo/core/util/shell/commands/F

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

Merge branch '1.6' Conflicts: assemble/bin/bootstrap_config.sh Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a711ae97 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a711ae97 Diff: http://git-wip-us

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

Merge branch '1.6' Conflicts: test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/58af0ce9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo

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

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

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

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

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

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

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

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

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

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