[3/8] git commit: ACCUMULO-3135 Fix javadoc misuse of link

2014-09-30 Thread ctubbsii
ACCUMULO-3135 Fix javadoc misuse of link Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8b17144e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8b17144e Diff:

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

2014-09-30 Thread ctubbsii
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/beebb946 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/beebb946 Diff:

[6/8] git commit: ACCUMULO-3190 Fix deprecation warning

2014-09-30 Thread ctubbsii
ACCUMULO-3190 Fix deprecation warning Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3586ea0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3586ea0 Diff:

[1/8] git commit: ACCUMULO-3135 Fix javadoc misuse of link

2014-09-30 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.5 5f2d3473e - 8b17144e3 refs/heads/1.6 8d316a387 - d3586ea0d refs/heads/master 2cac013a4 - 43ef53ed3 ACCUMULO-3135 Fix javadoc misuse of link Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

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

2014-09-30 Thread ctubbsii
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/beebb946 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/beebb946 Diff:

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

2014-09-30 Thread ctubbsii
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/43ef53ed Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43ef53ed Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43ef53ed

[7/8] git commit: ACCUMULO-3190 Fix deprecation warning

2014-09-30 Thread ctubbsii
ACCUMULO-3190 Fix deprecation warning Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3586ea0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3586ea0 Diff:

[2/8] git commit: ACCUMULO-3135 Fix javadoc misuse of link

2014-09-30 Thread ctubbsii
ACCUMULO-3135 Fix javadoc misuse of link Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8b17144e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8b17144e Diff:

git commit: ACCUMULO-3182 Attempt to fix bad merge

2014-10-02 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/master 089408d59 - dc0d01ce8 ACCUMULO-3182 Attempt to fix bad merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc0d01ce Tree:

git commit: ACCUMULO-3200 Remove unused class

2014-10-06 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/master d1f403205 - 0bb0012c1 ACCUMULO-3200 Remove unused class Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0bb0012c Tree:

[1/3] git commit: ACCUMULO-3203 Remove unused class

2014-10-06 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6 44bf5ed2b - dc2ba1046 refs/heads/master 0bb0012c1 - fbb7b47c9 ACCUMULO-3203 Remove unused class Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc2ba104 Tree:

[2/3] git commit: ACCUMULO-3203 Remove unused class

2014-10-06 Thread ctubbsii
ACCUMULO-3203 Remove unused class Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc2ba104 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc2ba104 Diff:

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

2014-10-06 Thread ctubbsii
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/fbb7b47c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fbb7b47c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fbb7b47c

git commit: ACCUMULO-3031 Conditionally ignore known-bad test due to JDK bug

2014-10-06 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/master fbb7b47c9 - 4ce6ee907 ACCUMULO-3031 Conditionally ignore known-bad test due to JDK bug Skip test execution when building on a known bad JDK version in the range (1.7.0_60, 1.7.0_72). This bug is expected to be fixed in 1.7.0_72.

git commit: ACCUMULO-3204 Remove old, unused classes

2014-10-06 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/master 4ce6ee907 - f4cf6e6e4 ACCUMULO-3204 Remove old, unused classes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f4cf6e6e Tree:

[2/3] git commit: ACCUMULO-3182 Fix javadoc (link to non-visible member)

2014-10-07 Thread ctubbsii
ACCUMULO-3182 Fix javadoc (link to non-visible member) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a5bd7ef Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a5bd7ef Diff:

[1/3] git commit: ACCUMULO-3182 Fix javadoc (link to non-visible member)

2014-10-07 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6 8cda2d645 - 4a5bd7ef6 refs/heads/master 359c21090 - f6b83ee50 ACCUMULO-3182 Fix javadoc (link to non-visible member) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

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

2014-10-07 Thread ctubbsii
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/f6b83ee5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6b83ee5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6b83ee5

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

2014-10-10 Thread ctubbsii
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

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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:

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

2014-10-10 Thread ctubbsii
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

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

2014-10-10 Thread ctubbsii
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

[2/3] git commit: ACCUMULO-2984 Remove unused javadoc tags (no description)

2014-10-27 Thread ctubbsii
ACCUMULO-2984 Remove unused javadoc tags (no description) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6f3a356b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6f3a356b Diff:

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

2014-10-27 Thread ctubbsii
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/65cc3d35 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/65cc3d35 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/65cc3d35

[1/3] git commit: ACCUMULO-2984 Remove unused javadoc tags (no description)

2014-10-27 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6 e4dbe897c - 6f3a356ba refs/heads/master 014d9d955 - 65cc3d355 ACCUMULO-2984 Remove unused javadoc tags (no description) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[4/4] git commit: Merge remote-tracking branch 'origin/master'

2014-10-31 Thread ctubbsii
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/64d1bbe9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/64d1bbe9 Diff:

[1/4] git commit: ACCUMULO-3280 Clean up Initialize

2014-10-31 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6 09a4f0aa6 - 5e0f6a426 refs/heads/master a0ffb3df2 - 64d1bbe9b ACCUMULO-3280 Clean up Initialize Stop creating unneeded metadata table dirs on every volume. Limit the impact of warnings suppression when using deprecated items.

[2/4] git commit: ACCUMULO-3280 Clean up Initialize

2014-10-31 Thread ctubbsii
ACCUMULO-3280 Clean up Initialize Stop creating unneeded metadata table dirs on every volume. Limit the impact of warnings suppression when using deprecated items. Remove redundant call to configure metadata tables in ZooKeeper. Improve log message for fs.defaultFS being file:/// Remove

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

2014-10-31 Thread ctubbsii
Merge branch '1.6' Conflicts: server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[01/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.5 69d665cb4 - 2deabd31a refs/heads/1.6 5e0f6a426 - 9b20a9d40 refs/heads/master 64d1bbe9b - cfbdef134 http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java

[08/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java -- diff --cc

[07/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java -- diff --cc

[06/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java index

[05/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java

[02/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/test/src/test/java/org/apache/accumulo/test/VolumeIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/VolumeIT.java index a338d5f,000..d5c940d mode

[03/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java index

[09/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java -- diff --cc

[42/50] [abbrv] git commit: Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
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/9b20a9d4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b20a9d4 Diff:

[45/50] [abbrv] Merge branch '1.6'

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/ReplicationProcessorTest.java -- diff --cc

[19/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBase.java -- diff --cc

[32/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java -- diff --cc

[36/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java -- diff --cc

[40/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBase.java -- diff --cc

[27/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java index

[10/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/master/src/main/java/org/apache/accumulo/master/Master.java -- diff --cc server/master/src/main/java/org/apache/accumulo/master/Master.java index

[37/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java -- diff --cc server/base/src/main/java/org/apache/accumulo/server/Accumulo.java index

[16/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java -- diff --cc server/base/src/main/java/org/apache/accumulo/server/Accumulo.java index

[23/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/test/src/test/java/org/apache/accumulo/test/VolumeIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/VolumeIT.java index a338d5f,000..d5c940d mode

[48/50] [abbrv] Merge branch '1.6'

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java -- diff --cc

[20/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java -- diff --cc

[35/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java -- diff --cc

[26/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java

[44/50] [abbrv] Merge branch '1.6'

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java -- diff --cc shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java index

[13/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java -- diff --cc

[22/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java index

[50/50] [abbrv] git commit: Merge branch '1.6'

2014-10-31 Thread ctubbsii
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/cfbdef13 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cfbdef13 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cfbdef13

[30/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java -- diff --cc

[14/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java -- diff --cc

[11/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java -- diff --cc

[18/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/core/src/main/java/org/apache/accumulo/core/data/Condition.java -- diff --cc core/src/main/java/org/apache/accumulo/core/data/Condition.java index

[38/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java -- diff --cc core/src/test/java/org/apache/accumulo/core/data/ValueTest.java index

[49/50] [abbrv] Merge branch '1.6'

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/core/src/main/java/org/apache/accumulo/core/util/Encoding.java -- diff --cc core/src/main/java/org/apache/accumulo/core/util/Encoding.java index

[24/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java index

[46/50] [abbrv] Merge branch '1.6'

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java

[28/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java -- diff --cc

[15/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java -- diff --cc

[47/50] [abbrv] Merge branch '1.6'

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfbdef13/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java -- diff --cc server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java

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

2014-10-31 Thread ctubbsii
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/9b20a9d4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b20a9d4 Diff:

[31/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/master/src/main/java/org/apache/accumulo/master/Master.java -- diff --cc server/master/src/main/java/org/apache/accumulo/master/Master.java index

[34/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java -- diff --cc

[33/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java -- diff --cc

[29/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java -- diff --cc

[17/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/core/src/test/java/org/apache/accumulo/core/data/ValueTest.java -- diff --cc core/src/test/java/org/apache/accumulo/core/data/ValueTest.java index

[12/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java -- diff --cc

[41/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java -- diff --cc

[25/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java

[39/50] [abbrv] Merge branch '1.5' into 1.6

2014-10-31 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b20a9d4/core/src/main/java/org/apache/accumulo/core/data/Condition.java -- diff --cc core/src/main/java/org/apache/accumulo/core/data/Condition.java index

[06/10] accumulo git commit: Merge remote-tracking branch 'origin/master' into ACCUMULO-3147

2014-11-07 Thread ctubbsii
Merge remote-tracking branch 'origin/master' into ACCUMULO-3147 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fa717c91 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fa717c91 Diff:

[10/10] accumulo git commit: Merge branch 'ACCUMULO-3147'

2014-11-07 Thread ctubbsii
Merge branch 'ACCUMULO-3147' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/34ca056b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/34ca056b Diff:

[04/10] accumulo git commit: ACCUMULO-3147 Create replication table at initialize, upgrade

2014-11-07 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e840549a/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java -- diff --git

[08/10] accumulo git commit: ACCUMULO-3147 Fix ReplicationServlet

2014-11-07 Thread ctubbsii
ACCUMULO-3147 Fix ReplicationServlet Properly show an informative banner message when the replication table is offline. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5cf1888e Tree:

[02/10] accumulo git commit: ACCUMULO-3147 Refactor ReplicationTable constants

2014-11-07 Thread ctubbsii
ACCUMULO-3147 Refactor ReplicationTable constants Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1a47b38 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1a47b38 Diff:

[05/10] accumulo git commit: ACCUMULO-3147 Create replication table at initialize, upgrade

2014-11-07 Thread ctubbsii
ACCUMULO-3147 Create replication table at initialize, upgrade Migrate to all replication code to a built-in system-managed replication table instead of the user-space one. Ensure all replication-related tests pass. Also fix a small bug in Mock which threw an exception when using

[01/10] accumulo git commit: ACCUMULO-3147 Refactor ReplicationTable constants

2014-11-07 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/master 5aff1fb7b - 34ca056b3 http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1a47b38/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java

[1/2] accumulo git commit: ACCUMULO-3231 Remove unused imports; fix javadocs

2014-11-07 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/master 3922e1ab4 - 566839ef7 ACCUMULO-3231 Remove unused imports; fix javadocs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e62b997c Tree:

[2/2] accumulo git commit: ACCUMULO-898 Suppress warning for serial version on old TInfo

2014-11-07 Thread ctubbsii
ACCUMULO-898 Suppress warning for serial version on old TInfo Thrift generated sources always suppressed these warnings. However, it should be noted that if anybody had actually serialized this class, its computed serialVersionUID will not match. This might limit the usefulness of

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

2014-11-10 Thread ctubbsii
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/bedbca56 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bedbca56 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bedbca56

<    5   6   7   8   9   10   11   12   13   14   >