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

[ctubbsii]

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 <tt>true</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);