You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2016/07/22 16:11:59 UTC
[1/2] accumulo git commit: ACCUMULO-4387 fix javadoc issue
Repository: accumulo
Updated Branches:
refs/heads/master ad985473a -> 5df9bc16f
ACCUMULO-4387 fix javadoc issue
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d074eff9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d074eff9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d074eff9
Branch: refs/heads/master
Commit: d074eff92883cbaf62158d79d182f76a623fe6f8
Parents: c587a6f
Author: Keith Turner <kt...@apache.org>
Authored: Fri Jul 22 11:52:35 2016 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Fri Jul 22 11:52:35 2016 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/master/MasterTime.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d074eff9/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java b/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java
index 27c57f0..93e81e7 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java
@@ -61,7 +61,7 @@ public class MasterTime extends TimerTask {
/**
* How long has this cluster had a Master?
*
- * @returns Approximate total duration this cluster has had a Master, in milliseconds.
+ * @return Approximate total duration this cluster has had a Master, in milliseconds.
*/
public synchronized long getTime() {
return MILLISECONDS.convert(System.nanoTime() + skewAmount, NANOSECONDS);
[2/2] accumulo git commit: Merge branch '1.8'
Posted by kt...@apache.org.
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/5df9bc16
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5df9bc16
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5df9bc16
Branch: refs/heads/master
Commit: 5df9bc16f5df2f0e050e1049821c49029ed6bc25
Parents: ad98547 d074eff
Author: Keith Turner <kt...@apache.org>
Authored: Fri Jul 22 11:53:51 2016 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Fri Jul 22 11:53:51 2016 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/master/MasterTime.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------