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

[ctubbsii]

Merge branch '1.6'

Conflicts:
        
core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e67296bb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e67296bb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e67296bb

Branch: refs/heads/master
Commit: e67296bb1fbe806c9b35827df30827ff4bf39c2c
Parents: 2f788f4 a3267d3
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Fri Dec 5 17:20:47 2014 -0500
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Fri Dec 5 17:20:47 2014 -0500

----------------------------------------------------------------------
 .../accumulo/core/client/lexicoder/DateLexicoder.java    | 11 ++++++-----
 .../core/client/lexicoder/ReverseLexicoderTest.java      |  6 +++++-
 2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e67296bb/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
----------------------------------------------------------------------
diff --cc 
core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
index 6e594be,3077645..bde8a3f
--- 
a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
@@@ -17,7 -17,7 +17,8 @@@
  package org.apache.accumulo.core.client.lexicoder;
  
  import java.io.UnsupportedEncodingException;
 +import java.util.Arrays;
+ import java.util.Calendar;
  import java.util.Collections;
  import java.util.Comparator;
  import java.util.Date;
@@@ -49,7 -52,7 +53,7 @@@ public class ReverseLexicoderTest exten
      Date date3 = new Date(System.currentTimeMillis() + 500);
  
      Comparator<Date> comparator = Collections.reverseOrder();
-     assertSortOrder(revLex, comparator, Arrays.asList(date1, date2, date3));
 -    assertSortOrder(revLex, comparator, date0, date1, date2, date3);
++    assertSortOrder(revLex, comparator, Arrays.asList(date0, date1, date2, 
date3));
  
      // truncate date to hours
      long time = System.currentTimeMillis() - (System.currentTimeMillis() % 
3600000);