[2/3] git commit: ACCUMULO-1403 Allow setiter to operate on SortedKeyValueIterator instead of only OptionDescriber

2014-01-04 Thread elserj
ACCUMULO-1403 Allow setiter to operate on SortedKeyValueIterator instead of only OptionDescriber Prompt the user to enter the necessary information when the provided class does not implement OptionDescriber, with a soft recommendation to implement OptionDescriber. Does not change the functionalit

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

2014-01-04 Thread elserj
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/799ce56f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/799ce56f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/799ce5

[1/3] git commit: ACCUMULO-1403 Allow setiter to operate on SortedKeyValueIterator instead of only OptionDescriber

2014-01-04 Thread elserj
Updated Branches: refs/heads/1.6.0-SNAPSHOT 4313ff8bb -> 68b60234f refs/heads/master b4aee0daa -> 799ce56ff ACCUMULO-1403 Allow setiter to operate on SortedKeyValueIterator instead of only OptionDescriber Prompt the user to enter the necessary information when the provided class does not im

[5/7] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-04 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4313ff8b Tree: htt

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

2014-01-04 Thread elserj
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/b4aee0da Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b4aee0da Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b4aee0

[4/7] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2014-01-04 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/feccaa4b Tree: htt

[3/7] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2014-01-04 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/feccaa4b Tree: htt

[2/7] git commit: ACCUMULO-2132 Add option when invoking MAC processes.

2014-01-04 Thread elserj
ACCUMULO-2132 Add option when invoking MAC processes. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25a7fdae Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25a7fdae Diff: http://git-wip-us.apache.org/repos/

[1/7] git commit: ACCUMULO-2132 Add option when invoking MAC processes.

2014-01-04 Thread elserj
Updated Branches: refs/heads/1.6.0-SNAPSHOT 764884e75 -> 4313ff8bb refs/heads/master de79c0c89 -> b4aee0daa ACCUMULO-2132 Add option when invoking MAC processes. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25a7

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

2014-01-04 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4313ff8b Tree: htt

[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2014-01-04 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/feccaa4b Tree: htt

[1/2] git commit: ACCUMULO-2132 Add option when invoking MAC processes.

2014-01-04 Thread elserj
Updated Branches: refs/heads/1.5.1-SNAPSHOT b93e8d8d6 -> feccaa4b1 ACCUMULO-2132 Add option when invoking MAC processes. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25a7fdae Tree: http://git-wip-us.apache.org/rep

git commit: ACCUMULO-2132 Add option when invoking MAC processes.

2014-01-04 Thread elserj
Updated Branches: refs/heads/1.4.5-SNAPSHOT a561152c8 -> 25a7fdaee ACCUMULO-2132 Add option when invoking MAC processes. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25a7fdae Tree: http://git-wip-us.apache.org/rep