accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [6/6] accumulo git commit: Merge branch '1.8'
Date Wed, 21 Jun 2017 15:36:50 GMT
Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 81393b88415836e83cd9d0849cfed52acec86aed
Parents: 87c1abc a351610
Author: Josh Elser <elserj@apache.org>
Authored: Wed Jun 21 11:19:41 2017 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Wed Jun 21 11:33:45 2017 -0400

----------------------------------------------------------------------
 server/monitor/pom.xml                          |  5 ++
 .../accumulo/monitor/servlets/trace/Basic.java  |  2 +-
 .../monitor/servlets/trace/BasicTest.java       | 55 ++++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/81393b88/server/monitor/pom.xml
----------------------------------------------------------------------
diff --cc server/monitor/pom.xml
index edaedff,d43d2f1..96d763b
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@@ -118,10 -129,10 +118,15 @@@
        <scope>test</scope>
      </dependency>
      <dependency>
+       <groupId>org.easymock</groupId>
+       <artifactId>easymock</artifactId>
+       <scope>test</scope>
+     </dependency>
++    <dependency>
 +      <groupId>org.slf4j</groupId>
 +      <artifactId>slf4j-log4j12</artifactId>
 +      <scope>test</scope>
 +    </dependency>
    </dependencies>
    <build>
      <pluginManagement>


Mime
View raw message