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

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

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

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

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

[5/6] 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/InMemoryMap.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f181cf6a Tree: http://git-wip-us.apache.org/repos

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

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

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

Merge branch '1.6' into 1.7 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/c283f4ac Tree: http://git-wip-us.apache.org/repos/asf/accu

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

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

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

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

Merge branch '1.6' into 1.7 Conflicts: examples/simple/.gitignore fate/.gitignore maven-plugin/.gitignore minicluster/.gitignore pom.xml proxy/.gitignore server/tracer/.gitignore trace/.gitignore Project: http://git-wip-us.apache.or

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

[5/6] 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/a4a1d6eb Tree: http://git-wip-us.apache.org/repo

[5/6] 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/Tablet.java server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java Projec

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

Merge branch '1.6' into 1.7 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/642add8c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/642add8c Diff: http://git-wip-us.apache.org/repo

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

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

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

Merge branch '1.6' into 1.7 Conflicts: docs/src/main/asciidoc/chapters/clients.txt Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d505843e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d505843e Dif

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

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

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

Merge branch '1.6' into 1.7 Conflicts: fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/76d9ed76 Tree: http://git-wip-us.apache.org/repos/asf/ac

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

Merge branch '1.6' into 1.7 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/14e88e4b Tree: http://git-wip-us.apache.org/repos/asf/a

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

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

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

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

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

Merge branch '1.6' into 1.7 Conflicts: fate/src/main/java/org/apache/accumulo/fate/Fate.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1853d088 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18

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

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

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

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

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

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

Merge branch '1.6' into 1.7 This merges ACCUMULO-4015 commits with -s ours, since that fix only applies to the Hadoop 1 profile for Accumulo versions 1.6.x and does not apply to 1.7 and later, which only support Hadoop 2. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http

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

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

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

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

Merge branch '1.6' into 1.7 Conflicts: shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/da484a88 Tree: http://git-wip-us.apache.org/

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

Merge branch '1.6' into 1.7 Conflicts: test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/071c32f5 Tree: http://git-wip-us.apache.org/repos/asf/accumu

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

Merge branch '1.6' into 1.7 Conflicts: assemble/bin/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5f76160c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5f76160c Diff: http://git-wip-us.a

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

Merge branch '1.6' into 1.7 Conflicts: shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/acef2e5d Tree: http://git-wip-us.apache.org/repos/asf/accu

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

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

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

Merge branch '1.6' into 1.7 Conflicts: test/system/continuous/run-verify.sh Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1bc1dd8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1bc1dd8 Diff: http

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

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

Merge branch '1.6' into 1.7 Conflicts: maven-plugin/pom.xml pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/50f8a793 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/50f8a793 Diff: http

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

Merge branch '1.6' into 1.7 Conflicts: server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java 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-wi

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

Merge branch '1.6' into 1.7 Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e0c72f25 Tree: http://git-wip-us

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

[5/6] 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/99c734c8 Tree: http://git-wip-us.apache.org/repo

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

Merge branch '1.6' into 1.7 Conflicts: test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61bfbb22 Tree: http://git-wip-us.apache.org/repos/asf

[5/6] 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/f6ba154f Tree: http://git-wip-us.apache.org/repo

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

Merge branch '1.6' into 1.7 Conflicts: server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/07672bdc Tree: http://git-wip-us.apache.org

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

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

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

Merge branch '1.6' into 1.7 Conflicts: server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25d9b285 Tree: http://git-wip-us.apache.org/repos

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

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

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

Merge branch '1.6' into 1.7 Conflicts: shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0bbc6759 Tree: http://git-wip-us.apache.org/repos/asf/

[5/6] 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/client/impl/NamespaceOperationsImpl.java core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: htt

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