[3/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' 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/9843911d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9843911d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9843911d Branch: refs/heads/1.6.0-SNAPSHOT Commit: 9843911d939bafc2808f3edb30903881cb7fa04d Parents: 3354b92 34a44e7 Author: Mike Drob md...@cloudera.com Authored: Sat Mar 29 00:49:59 2014 -0400 Committer: Mike Drob md...@cloudera.com Committed: Sat Mar 29 00:49:59 2014 -0400 -- --
[3/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d030cae Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d030cae Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d030cae Branch: refs/heads/1.6.0-SNAPSHOT Commit: 5d030cae908905de0b4bc51981c7690011d390c7 Parents: a5a0552 72c9af4 Author: Keith Turner ktur...@apache.org Authored: Thu Mar 27 12:39:59 2014 -0400 Committer: Keith Turner ktur...@apache.org Committed: Thu Mar 27 12:39:59 2014 -0400 -- --
[3/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/src/main/java/org/apache/accumulo/test/functional/RunTests.java
test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/20e2b0a6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/20e2b0a6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/20e2b0a6
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 20e2b0a6a6ca56e3e91fbf9ac1c1108b6b98dc9d
Parents: 67a11a8 d77cba3
Author: Christopher Tubbs ctubb...@apache.org
Authored: Wed Mar 26 13:06:34 2014 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Wed Mar 26 13:06:34 2014 -0400
--
.../accumulo/core/iterators/Combiner.java | 21 ++--
1 file changed, 6 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/20e2b0a6/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
--
diff --cc core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index 58071cf,e8921e5..ceb4411
--- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@@ -80,21 -80,21 +80,11 @@@ public abstract class Combiner extends
return source.hasTop() !source.getTopKey().isDeleted()
topKey.equals(source.getTopKey(), PartialKey.ROW_COLFAM_COLQUAL_COLVIS);
}
--/**
-- * @return tttrue/tt if there is another Value
-- *
-- * @see java.util.Iterator#hasNext()
-- */
@Override
public boolean hasNext() {
return hasNext;
}
--/**
-- * @return the next Value
-- *
-- * @see java.util.Iterator#next()
-- */
@Override
public Value next() {
if (!hasNext)
@@@ -110,9 -110,9 +100,10 @@@
}
/**
-- * unsupported
++ * This method is unsupported in this iterator.
*
-- * @see java.util.Iterator#remove()
++ * @throws UnsupportedOperationException
++ * when called
*/
@Override
public void remove() {
@@@ -272,7 -272,7 +263,7 @@@
}
if (!options.containsKey(COLUMNS_OPTION))
throw new IllegalArgumentException(options must include + ALL_OPTION
+ or + COLUMNS_OPTION);
--
++
String encodedColumns = options.get(COLUMNS_OPTION);
if (encodedColumns.length() == 0)
throw new IllegalArgumentException(empty columns specified in option
+ COLUMNS_OPTION);
[3/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' 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/fd99e24d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd99e24d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd99e24d Branch: refs/heads/1.6.0-SNAPSHOT Commit: fd99e24dc32be49433476be85893138296ec5cbf Parents: 1970b58 ba48f03 Author: Eric C. Newton eric.new...@gmail.com Authored: Tue Mar 25 10:41:22 2014 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Tue Mar 25 10:41:22 2014 -0400 -- --
[3/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' 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/76b3fd04 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/76b3fd04 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/76b3fd04 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 76b3fd0499cffc2e40e7b8b2059ed64ad0c701f1 Parents: fd99e24 00355d0 Author: Mike Drob md...@cloudera.com Authored: Tue Mar 25 11:02:56 2014 -0400 Committer: Mike Drob md...@cloudera.com Committed: Tue Mar 25 11:02:56 2014 -0400 -- --
[3/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' 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/bc1f026d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bc1f026d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bc1f026d Branch: refs/heads/1.6.0-SNAPSHOT Commit: bc1f026d9b6fd584d46f0a66fd9a16a891ce8587 Parents: 04d51b3 ce6a721 Author: Mike Drob md...@cloudera.com Authored: Mon Mar 24 16:42:36 2014 -0400 Committer: Mike Drob md...@cloudera.com Committed: Mon Mar 24 16:42:36 2014 -0400 -- --
[3/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f98331c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f98331c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f98331c Branch: refs/heads/1.6.0-SNAPSHOT Commit: 8f98331c5ea3e3a3c0068b03bfdd37fb08dc4631 Parents: 7c2a552 082adbf Author: Eric Newton eric.new...@gmail.com Authored: Fri Mar 14 14:18:56 2014 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Mar 14 14:18:56 2014 -0400 -- --
