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

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

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

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

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

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

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

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

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

Merge branch '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/0dd1d6a5 Tree:

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

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

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

Merge branch '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/db213159 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/db213159 Diff:

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

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

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

Merge branch '1.7' Conflicts: test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8949fd46 Tree:

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

Merge branch '1.7' Conflicts: maven-plugin/src/it/plugin-test/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/03246da4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/03246da4 Diff:

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

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

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

Merge branch '1.7' Conflicts: core/.gitignore minicluster/.gitignore start/.gitignore Closes apache/accumulo#66 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a6b4820 Tree:

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

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

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

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

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

Merge branch '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/21123cca Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/21123cca Diff:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Merge branch '1.7' Conflicts: test/src/main/java/org/apache/accumulo/test/NamespacesIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a81b966a Tree:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Merge branch '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/f6df8991 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6df8991 Diff:

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

Merge branch '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/93f285ee Tree:

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

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

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

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

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

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

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

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

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

Merge branch '1.7' Conflicts: test/src/test/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae2255c8 Tree:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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