[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/87177502 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/87177502 Diff: http://git-wip-us.apache.org/repos/asf/

[1/6] git commit: ACCUMULO-2747 Added dash to 'show few' option

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 3d469eb85 -> b664f51d8 refs/heads/1.6.1-SNAPSHOT ab4ecfc25 -> 871775028 refs/heads/master 5e4478057 -> 16d1f3b56 ACCUMULO-2747 Added dash to 'show few' option Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org

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

Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/16d1f3b5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/16d1f3b5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/16d1f3

[3/6] git commit: ACCUMULO-2747 Added dash to 'show few' option

ACCUMULO-2747 Added dash to 'show few' option Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b664f51d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b664f51d Diff: http://git-wip-

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/87177502 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/87177502 Diff: http://git-wip-us.apache.org/repos/asf/

[2/6] git commit: ACCUMULO-2747 Added dash to 'show few' option

ACCUMULO-2747 Added dash to 'show few' option Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b664f51d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b664f51d Diff: http://git-wip-

[9/9] git commit: Merge branch '1.6.1-SNAPSHOT'

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

[8/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ab4ecfc2 Tree: http://g

[1/9] git commit: ACCUMULO-2832 fixed object creation in Defaultformatter. Uses single Text object.

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT a3a86412b -> 3d469eb85 refs/heads/1.6.1-SNAPSHOT b65035a31 -> ab4ecfc25 refs/heads/master 7d639d8b8 -> 5e4478057 ACCUMULO-2832 fixed object creation in Defaultformatter. Uses single Text object. Signed-off-by: Josh Elser

[5/9] git commit: ACCUMULO-2663 Fix some compilation issues from guava deps

ACCUMULO-2663 Fix some compilation issues from guava deps Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d469eb8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d469eb8 Diff: http://git-wip-us.apache.org/re

[3/9] git commit: ACCUMULO-2832 fixed object creation in Defaultformatter. Uses single Text object.

ACCUMULO-2832 fixed object creation in Defaultformatter. Uses single Text object. Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/59591273 Tree: http://git-wip-us.apache.org/repos/asf/accumul

[4/9] git commit: ACCUMULO-2663 Fix some compilation issues from guava deps

ACCUMULO-2663 Fix some compilation issues from guava deps Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d469eb8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d469eb8 Diff: http://git-wip-us.apache.org/re

[6/9] git commit: ACCUMULO-2663 Fix some compilation issues from guava deps

ACCUMULO-2663 Fix some compilation issues from guava deps Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d469eb8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d469eb8 Diff: http://git-wip-us.apache.org/re

[7/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ab4ecfc2 Tree: http://g

[2/9] git commit: ACCUMULO-2832 fixed object creation in Defaultformatter. Uses single Text object.

ACCUMULO-2832 fixed object creation in Defaultformatter. Uses single Text object. Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/59591273 Tree: http://git-wip-us.apache.org/repos/asf/accumul

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b65035a3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b65035a3 Diff: http://git-wip-us.apache.org/repos/asf/

[1/6] git commit: ACCUMULO-2663 - Remove usage of String#split from Combiner#init

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT d1655a413 -> a3a86412b refs/heads/1.6.1-SNAPSHOT 2968fdf02 -> b65035a31 refs/heads/master 6c7650327 -> 7d639d8b8 ACCUMULO-2663 - Remove usage of String#split from Combiner#init Noticed that inside Combiner#init, the comma-sep

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

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

[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b65035a3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b65035a3 Diff: http://git-wip-us.apache.org/repos/asf/

[3/6] git commit: ACCUMULO-2663 - Remove usage of String#split from Combiner#init

ACCUMULO-2663 - Remove usage of String#split from Combiner#init Noticed that inside Combiner#init, the comma-separated list of columns is split out using the inefficient String#split method. This should be switched into something that doesn't used Regexs since this method is invoked a surprising

[2/6] git commit: ACCUMULO-2663 - Remove usage of String#split from Combiner#init

ACCUMULO-2663 - Remove usage of String#split from Combiner#init Noticed that inside Combiner#init, the comma-separated list of columns is split out using the inefficient String#split method. This should be switched into something that doesn't used Regexs since this method is invoked a surprising

git commit: ACCUMULO-612 added information on monitor page to user manual

Repository: accumulo Updated Branches: refs/heads/master f783b4b5b -> 6c7650327 ACCUMULO-612 added information on monitor page to user manual Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c765032 Tree: http://git-

[11/11] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Conflicts: docs/src/main/asciidoc/chapters/table_configuration.txt test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/

[06/11] git commit: ACCUMULO-2796 Adds doc for iterator ordering

ACCUMULO-2796 Adds doc for iterator ordering Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d1655a41 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1655a41 Diff: http://git-wip-u

[01/11] git commit: ACCUMULO-2514 switch over to log4j where it makes sense

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 8de426270 -> d1655a413 refs/heads/1.6.1-SNAPSHOT 3d8311557 -> 2968fdf02 refs/heads/master 6c30e6b8e -> f783b4b5b ACCUMULO-2514 switch over to log4j where it makes sense Project: http://git-wip-us.apache.org/repos/asf/accumul

[08/11] git commit: ACCUMULO-2796 Adds doc for iterator ordering

ACCUMULO-2796 Adds doc for iterator ordering Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d1655a41 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1655a41 Diff: http://git-wip-u

[05/11] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d831155 Tree: http:/

[02/11] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0af28839 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0af28839 Diff: http://git-wip-us.apache.org/repos/asf/

[03/11] git commit: ACCUMULO-2824 OperationsImpl#getDiskUsage() should check pair against null in catch clause

ACCUMULO-2824 OperationsImpl#getDiskUsage() should check pair against null in catch clause {code} } catch (TTransportException e) { // some sort of communication error occurred, retry log.debug("disk usage request failed " + pair.getFirst() + ", retrying ... ", e); {code} p

[10/11] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2968fdf0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2968fdf0 Diff: http://git-wip-us.apache.org/repos/asf/

[07/11] git commit: ACCUMULO-2796 Adds doc for iterator ordering

ACCUMULO-2796 Adds doc for iterator ordering Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d1655a41 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1655a41 Diff: http://git-wip-u

[04/11] git commit: ACCUMULO-2890 Remove AccumuloNotInitializedException

ACCUMULO-2890 Remove AccumuloNotInitializedException Signed-off-by: Bill Havanki Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8de42627 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8de42627 Diff: http:/

[09/11] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2968fdf0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2968fdf0 Diff: http://git-wip-us.apache.org/repos/asf/

git commit: ACCUMULO-2647 changed if/then/else to switch statement

Repository: accumulo Updated Branches: refs/heads/master 13956c0bf -> 6c30e6b8e ACCUMULO-2647 changed if/then/else to switch statement Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c30

[2/3] git commit: ACCUMULO-2890 Remove AccumuloNotInitializedException

ACCUMULO-2890 Remove AccumuloNotInitializedException Signed-off-by: Bill Havanki Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8de42627 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8de42627 Diff: http:/

[3/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d831155 Tree: http:/

[1/3] git commit: ACCUMULO-2890 Remove AccumuloNotInitializedException

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 67bc847d7 -> 8de426270 refs/heads/1.6.1-SNAPSHOT b369585f5 -> 3d8311557 ACCUMULO-2890 Remove AccumuloNotInitializedException Signed-off-by: Bill Havanki Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: h

git commit: ACCUMULO-2824 OperationsImpl#getDiskUsage() should check pair against null in catch clause

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 0af288391 -> b369585f5 ACCUMULO-2824 OperationsImpl#getDiskUsage() should check pair against null in catch clause {code} } catch (TTransportException e) { // some sort of communication error occurred, retry

[1/2] git commit: ACCUMULO-2514 switch over to log4j where it makes sense

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT f34230f7b -> 0af288391 ACCUMULO-2514 switch over to log4j where it makes sense Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67bc847d Tree: http://gi

git commit: ACCUMULO-2514 switch over to log4j where it makes sense

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT c5aac49ed -> 67bc847d7 ACCUMULO-2514 switch over to log4j where it makes sense Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67bc847d Tree: http://gi

[2/2] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0af28839 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0af28839 Diff: http://git-wip-us.apache.org/repos/asf/

[2/3] git commit: Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f34230f7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f34230f7 Diff: http://git-wip-u

[1/3] git commit: ACCUMULO-2410 TServerUtils no longer needs to catch NPE as a thrift bug workaround

Repository: accumulo Updated Branches: refs/heads/master 30805fa18 -> 13956c0bf ACCUMULO-2410 TServerUtils no longer needs to catch NPE as a thrift bug workaround Signed-off-by: John Vines Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/re

[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'

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

[1/2] git commit: ACCUMULO-2410 TServerUtils no longer needs to catch NPE as a thrift bug workaround

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 31aea2ad8 -> f34230f7b ACCUMULO-2410 TServerUtils no longer needs to catch NPE as a thrift bug workaround Signed-off-by: John Vines Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apach

[2/2] git commit: Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f34230f7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f34230f7 Diff: http://git-wip-u

git commit: ACCUMULO-2410 TServerUtils no longer needs to catch NPE as a thrift bug workaround

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 53ec68999 -> c5aac49ed ACCUMULO-2410 TServerUtils no longer needs to catch NPE as a thrift bug workaround Signed-off-by: John Vines Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apach

git commit: ACCUMULO-2294 Changed DateFormat to be like the rest

Repository: accumulo Updated Branches: refs/heads/master cf8bafa75 -> 30805fa18 ACCUMULO-2294 Changed DateFormat to be like the rest Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/30805fa

[2/4] git commit: ACCUMULO-2899 Correctly handle older internals.

ACCUMULO-2899 Correctly handle older internals. Make sure that we behave correctly when our cluster has been upgraded 1.4 -> 1.5 -> 1.6 * dfsloggers need to track the cq used to create them so they can be used to issue putDeletes * rewrite 1.4 WAL paths to the top level wal directory * adjust r

[1/4] git commit: ACCUMULO-2899 Correctly handle older internals.

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 1b170e8e5 -> 31aea2ad8 refs/heads/master 3bb70a694 -> cf8bafa75 ACCUMULO-2899 Correctly handle older internals. Make sure that we behave correctly when our cluster has been upgraded 1.4 -> 1.5 -> 1.6 * dfsloggers need to trac

[4/4] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf8bafa7 Tree: http://git-wip-us.apache.org/r

[1/2] git commit: ACCUMULO-1376 Shell verifies before dropping user

Repository: accumulo Updated Branches: refs/heads/master 97cac218c -> 3bb70a694 ACCUMULO-1376 Shell verifies before dropping user Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f3d73910 T

[2/2] git commit: ACCUMULO-1376 Add a unit test that ensure that the user is prompted w/o the force option when dropping a user

ACCUMULO-1376 Add a unit test that ensure that the user is prompted w/o the force option when dropping a user Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3bb70a69 Tree: http://git-wip-us.apache.org/repos/asf/accumul