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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae2255c8/test/src/test/java/org/apache/accumulo/test/proxy/TestProxyClient.java -- diff --cc test/src/test/java/org/apache/accumulo/test/proxy/TestProxyClient.java index 8d3863b,

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

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

Merge branch '1.7' into 1.8 Conflicts: core/src/test/java/org/apache/accumulo/core/data/RangeTest.java core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java Project: http:

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

Merge branch '1.7' into 1.8 Conflicts: server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/037c1384 Tree: http://git-wip-us.apache.org/repos/a

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

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

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

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

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

Merge branch '1.7' into 1.8 Conflicts: shell/src/main/java/org/apache/accumulo/shell/commands/GrepCommand.java shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.or

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

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

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

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

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

Merge branch '1.7' into 1.8 Conflicts: README.md Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e8118511 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e8118511 Diff: http://git-wip-us.apache.org/r

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

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

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

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

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

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

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

Merge branch '1.7' into 1.8 Conflicts: assemble/pom.xml 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/6cc07fa6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6cc07fa6 Diff: htt

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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