git commit: ACCUMULO-3197 Remove deprecated Instance.getConfiguration()

Repository: accumulo Updated Branches: refs/heads/master 3fba0b543 -> 8fe826dd1 ACCUMULO-3197 Remove deprecated Instance.getConfiguration() This patch removes the deprecated setter/getter which had poorly-defined behavior in previous versions, and was prone to incorrect use. It replaces it

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

[3/7] git commit: ACCUMULO-3229 Format long as decimal integer, not floating-point

ACCUMULO-3229 Format long as decimal integer, not floating-point Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/891584fb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/891584fb Diff: http://git-wip-us.apache

[1/7] git commit: Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6

Repository: accumulo Updated Branches: refs/heads/1.5 11762c5fb -> 891584fb7 refs/heads/1.6 71e5f6b97 -> 289053085 refs/heads/master 46d45774c -> 3fba0b543 Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accum

[6/7] git commit: Merge branch '1.5' into 1.6

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

[5/7] git commit: Merge branch '1.5' into 1.6

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

[2/7] git commit: ACCUMULO-3229 Format long as decimal integer, not floating-point

ACCUMULO-3229 Format long as decimal integer, not floating-point Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/891584fb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/891584fb Diff: http://git-wip-us.apache

[4/7] git commit: ACCUMULO-3229 Format long as decimal integer, not floating-point

ACCUMULO-3229 Format long as decimal integer, not floating-point Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/891584fb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/891584fb Diff: http://git-wip-us.apache

[1/2] git commit: ACCUMULO-3228 fix possible resource leaks

Repository: accumulo Updated Branches: refs/heads/master 1fcb96f2f -> 46d45774c ACCUMULO-3228 fix possible resource leaks Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f55d0bf9 Tree: http://git-wip-us.apache.org/re

[2/2] git commit: ACCUMULO-3228 fix possible resource leaks

ACCUMULO-3228 fix possible resource leaks Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46d45774 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46d45774 Diff: http://git-wip-us.apache.org/repos/asf/accumulo

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

Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/71e5f6b9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/71e5f6b9 Diff: http://gi

[1/2] git commit: ACCUMULO-3228 fix possible resource leaks

Repository: accumulo Updated Branches: refs/heads/1.6 9aca7d74d -> 71e5f6b97 ACCUMULO-3228 fix possible resource leaks Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f55d0bf9 Tree: http://git-wip-us.apache.org/repos

[12/21] git commit: ACCUMULO-3227 A bunch of string encoding issues.

ACCUMULO-3227 A bunch of string encoding issues. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4acf7abd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4acf7abd Diff: http://git-wip-us.apache.org/repos/asf/a

[02/21] git commit: ACCUMULO-3225 Replace dead ternary statement

ACCUMULO-3225 Replace dead ternary statement Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7b1bb102 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7b1bb102 Diff: http://git-wip-us.apache.org/repos/asf/accum

[06/21] git commit: ACCUMULO-3226 Remove unnecessary null check

ACCUMULO-3226 Remove unnecessary null check Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/633e4df1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/633e4df1 Diff: http://git-wip-us.apache.org/repos/asf/accumu

[04/21] git commit: ACCUMULO-3226 Remove unnecessary null check

ACCUMULO-3226 Remove unnecessary null check Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/633e4df1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/633e4df1 Diff: http://git-wip-us.apache.org/repos/asf/accumu

[08/21] git commit: Merge branch '1.5' into 1.6

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

[13/21] git commit: Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5

Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/11762c5f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/11762c5f Diff: http://gi

[11/21] git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: core/src/main/java/org/apache/accumulo/core/security/Authorizations.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dac8a893 Tree: http://git-wip-us.apache.org/repos/asf/accumu

[18/21] git commit: Merge branch '1.5' into 1.6

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

[01/21] git commit: ACCUMULO-3225 Replace dead ternary statement

Repository: accumulo Updated Branches: refs/heads/1.5 085c5b793 -> 11762c5fb refs/heads/1.6 3a73e25f2 -> 9aca7d74d refs/heads/master 72336eb81 -> 1fcb96f2f ACCUMULO-3225 Replace dead ternary statement Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.

[14/21] git commit: Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5

Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/11762c5f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/11762c5f Diff: http://gi

[09/21] git commit: ACCUMULO-3225 Remove dead ternary statement

ACCUMULO-3225 Remove dead ternary statement Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/45e2e590 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/45e2e590 Diff: http://git-wip-us.apache.org/repos/asf/accumu

[16/21] git commit: Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6

Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec6f069c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec6f069c Diff: http://gi

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

[03/21] git commit: ACCUMULO-3225 Replace dead ternary statement

ACCUMULO-3225 Replace dead ternary statement Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7b1bb102 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7b1bb102 Diff: http://git-wip-us.apache.org/repos/asf/accum

[17/21] git commit: Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6

Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec6f069c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec6f069c Diff: http://gi

[10/21] git commit: ACCUMULO-3225 Remove dead ternary statement

ACCUMULO-3225 Remove dead ternary statement Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/45e2e590 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/45e2e590 Diff: http://git-wip-us.apache.org/repos/asf/accumu

[05/21] git commit: ACCUMULO-3226 Remove unnecessary null check

ACCUMULO-3226 Remove unnecessary null check Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/633e4df1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/633e4df1 Diff: http://git-wip-us.apache.org/repos/asf/accumu

[20/21] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9976bd73 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9976bd73 Diff: http://git-wip-

[15/21] git commit: Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5

Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/11762c5f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/11762c5f Diff: http://gi

[19/21] git commit: Merge branch '1.5' into 1.6

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

[07/21] git commit: Merge branch '1.5' into 1.6

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

[1/6] git commit: ACCUMULO-3224 Use nanoTime in the shell's auth timeout

Repository: accumulo Updated Branches: refs/heads/1.5 3cce10696 -> 085c5b793 refs/heads/1.6 a269f75ba -> 3a73e25f2 refs/heads/master 1c657edf8 -> 72336eb81 ACCUMULO-3224 Use nanoTime in the shell's auth timeout Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://g

[4/6] git commit: Merge branch '1.5' into 1.6

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

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

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

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

[2/6] git commit: ACCUMULO-3224 Use nanoTime in the shell's auth timeout

ACCUMULO-3224 Use nanoTime in the shell's auth timeout Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/085c5b79 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/085c5b79 Diff: http://git-wip-us.apache.org/repos

[3/6] git commit: ACCUMULO-3224 Use nanoTime in the shell's auth timeout

ACCUMULO-3224 Use nanoTime in the shell's auth timeout Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/085c5b79 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/085c5b79 Diff: http://git-wip-us.apache.org/repos

[2/6] git commit: ACCUMULO-3223 Explicitly handle null from getOnlineTabletsForTable

ACCUMULO-3223 Explicitly handle null from getOnlineTabletsForTable Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3cce1069 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3cce1069 Diff: http://git-wip-us.apac

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

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

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

[3/6] git commit: ACCUMULO-3223 Explicitly handle null from getOnlineTabletsForTable

ACCUMULO-3223 Explicitly handle null from getOnlineTabletsForTable Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3cce1069 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3cce1069 Diff: http://git-wip-us.apac

[1/6] git commit: ACCUMULO-3223 Explicitly handle null from getOnlineTabletsForTable

Repository: accumulo Updated Branches: refs/heads/1.5 e18aacda3 -> 3cce10696 refs/heads/1.6 1b35d2633 -> a269f75ba refs/heads/master 5640280d8 -> 1c657edf8 ACCUMULO-3223 Explicitly handle null from getOnlineTabletsForTable Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Comm

[4/6] git commit: Merge branch '1.5' into 1.6

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

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

Merge branch '1.6' Conflicts: core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5640280d Tree: http://git-wip-us.apache.org/repos/asf/

[2/3] git commit: ACCUMULO-3218 Set the list separator to \0 to 'disable' list interpretation

ACCUMULO-3218 Set the list separator to \0 to 'disable' list interpretation ZooKeeperInstance, because of how commons-configuration was parsing the values, was treating a comma separated list of ZK servers (which we intend to be a single value) as multiple and only returning the first when getStri

[1/3] git commit: ACCUMULO-3218 Set the list separator to \0 to 'disable' list interpretation

Repository: accumulo Updated Branches: refs/heads/1.6 a234def61 -> 1b35d2633 refs/heads/master 4bbaddcab -> 5640280d8 ACCUMULO-3218 Set the list separator to \0 to 'disable' list interpretation ZooKeeperInstance, because of how commons-configuration was parsing the values, was treating a com

git commit: ACCUMULO-3222 Get Durability for tablet after null check. Add final modifiers.

Repository: accumulo Updated Branches: refs/heads/master b01056616 -> 4bbaddcab ACCUMULO-3222 Get Durability for tablet after null check. Add final modifiers. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4bbaddca

[2/3] git commit: ACCUMULO-3215 Remove deprecated javadoc link

ACCUMULO-3215 Remove deprecated javadoc link Remove unneeded javadoc link to deprecated property in a test to avoid a deprecation warning. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a234def6 Tree: http://git-wi

[1/3] git commit: ACCUMULO-3215 Remove deprecated javadoc link

Repository: accumulo Updated Branches: refs/heads/1.6 f74bd1827 -> a234def61 refs/heads/master bb97fbf85 -> b01056616 ACCUMULO-3215 Remove deprecated javadoc link Remove unneeded javadoc link to deprecated property in a test to avoid a deprecation warning. Project: http://git-wip-us.ap

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

[2/3] git commit: ACCUMULO-3220 Make sure to re-set the local cipher variable when it wasn't initialized

ACCUMULO-3220 Make sure to re-set the local cipher variable when it wasn't initialized Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f74bd182 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f74bd182 Diff: h

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

[1/3] git commit: ACCUMULO-3220 Make sure to re-set the local cipher variable when it wasn't initialized

Repository: accumulo Updated Branches: refs/heads/1.6 5029a4422 -> f74bd1827 refs/heads/master 52a1f1124 -> bb97fbf85 ACCUMULO-3220 Make sure to re-set the local cipher variable when it wasn't initialized Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-

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

[1/6] git commit: ACCUMULO-3221 Ensure arithmetic happens as longs and not integers.

Repository: accumulo Updated Branches: refs/heads/1.5 854dce9ff -> e18aacda3 refs/heads/1.6 e7dc5364d -> 5029a4422 refs/heads/master 300f7941c -> 52a1f1124 ACCUMULO-3221 Ensure arithmetic happens as longs and not integers. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Comm

[2/6] git commit: ACCUMULO-3221 Ensure arithmetic happens as longs and not integers.

ACCUMULO-3221 Ensure arithmetic happens as longs and not integers. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e18aacda Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e18aacda Diff: http://git-wip-us.apac

[3/6] git commit: ACCUMULO-3221 Ensure arithmetic happens as longs and not integers.

ACCUMULO-3221 Ensure arithmetic happens as longs and not integers. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e18aacda Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e18aacda Diff: http://git-wip-us.apac

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

Merge branch '1.5' into 1.6 Conflicts: core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5029a442 Tree: http://git-wip-us.apache.org/repos/asf/accu

[4/6] git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5029a442 Tree: http://git-wip-us.apache.org/repos/asf/accu

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

[1/3] git commit: ACCUMULO-3220 Fail fast if the provided cipher isn't a block cipher.

Repository: accumulo Updated Branches: refs/heads/1.6 ccd4897e1 -> e7dc5364d refs/heads/master eed30078a -> 300f7941c ACCUMULO-3220 Fail fast if the provided cipher isn't a block cipher. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos

[2/3] git commit: ACCUMULO-3220 Fail fast if the provided cipher isn't a block cipher.

ACCUMULO-3220 Fail fast if the provided cipher isn't a block cipher. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7dc5364 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7dc5364 Diff: http://git-wip-us.ap