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

[bhavanki]

Merge branch '1.6.0-SNAPSHOT'

Conflicts:
        
server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java


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

Branch: refs/heads/master
Commit: a831aca24cfa5a5fa843afaa39864854c9951e8d
Parents: 277da3f d2089c8
Author: Bill Havanki <bhava...@cloudera.com>
Authored: Fri Mar 28 15:09:03 2014 -0400
Committer: Bill Havanki <bhava...@cloudera.com>
Committed: Fri Mar 28 15:09:03 2014 -0400

----------------------------------------------------------------------
 .../accumulo/server/problems/ProblemReport.java |  33 +++-
 .../apache/accumulo/server/AccumuloTest.java    |  85 +++++++++
 .../apache/accumulo/server/ServerOptsTest.java  |  42 +++++
 .../server/conf/TableConfigurationTest.java     |  46 +++++
 .../server/master/state/MergeInfoTest.java      | 166 +++++++++++++++++
 .../master/state/TabletLocationStateTest.java   | 163 +++++++++++++++++
 .../server/problems/ProblemReportTest.java      | 182 +++++++++++++++++++
 .../problems/ProblemReportingIteratorTest.java  |  96 ++++++++++
 .../server/tablets/LogicalTimeTest.java         |  91 ++++++++++
 .../accumulo/server/tablets/MillisTimeTest.java |  87 +++++++++
 .../accumulo/server/tablets/TabletTimeTest.java | 156 ++++++++++++++++
 .../accumulo/server/util/AdminCommandsTest.java |  81 +++++++++
 .../accumulo/server/util/FileInfoTest.java      |  42 +++++
 .../accumulo/server/util/FileUtilTest.java      |  27 ++-
 .../accumulo/server/util/TServerUtilsTest.java  |  77 ++++++++
 15 files changed, 1364 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a831aca2/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
----------------------------------------------------------------------
diff --cc 
server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
index d0aef3d,b882195..99349b1
--- 
a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
@@@ -48,10 -50,8 +50,10 @@@ public class ProblemReport 
    private String server;
    private long creationTime;
    
-   public ProblemReport(String table, ProblemType problemType, String 
resource, String server, Throwable e) {
+   public ProblemReport(String table, ProblemType problemType, String 
resource, String server, Throwable e, long creationTime) {
 -    ArgumentChecker.notNull(table, problemType, resource);
 +    checkNotNull(table, "table is null");
 +    checkNotNull(problemType, "problemType is null");
 +    checkNotNull(resource, "resource is null");
      this.tableName = table;
      
      this.problemType = problemType;