[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Conflicts: core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/94008f6a Tree: http://git-wip-us.apa

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/77bb2730 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/77bb2730 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/77bb27

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2256227b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2256227b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/225622

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5655a044 Tree: http://git-wip-us.apache.org/re

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2849cbd8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2849cbd8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2849cb

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62661dcc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62661dcc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62661d

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1429eca9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1429eca9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1429ec

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/44d4cef2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/44d4cef2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/44d4ce

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/11d724e8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/11d724e8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/11d724

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4681f0f3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4681f0f3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4681f0

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/04b79b2a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04b79b2a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04b79b

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9386be87 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9386be87 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9386be

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/00db80b6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/00db80b6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/00db80

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/012efd72 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/012efd72 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/012efd

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/39a10c8b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/39a10c8b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/39a10c

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/92e2f8e4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/92e2f8e4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/92e2f8

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6aed342b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6aed342b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6aed34

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6669b1e9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6669b1e9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6669b1

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/66cccbe4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/66cccbe4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/66cccb

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6a78fbd5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6a78fbd5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6a78fb

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0b4211d5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0b4211d5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0b4211

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24e62a08 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c92a63f Tree: http://git-wip-us.apache.org/r

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62e4375a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62e4375a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62e437

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/96471f44 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/96471f44 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/96471f

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

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