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 2017/01/30 22:18:25 UTC
[1/2] accumulo git commit: ACCUMULO-4578 fixed checkstyle issue
Repository: accumulo
Updated Branches:
refs/heads/1.8 1f31ca6c2 -> 09fcd142e
ACCUMULO-4578 fixed checkstyle issue
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5f664cd7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5f664cd7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5f664cd7
Branch: refs/heads/1.8
Commit: 5f664cd76d64d8fb11a80be7a16f1988a92af0d3
Parents: 6d8a5fa
Author: Keith Turner <kt...@apache.org>
Authored: Mon Jan 30 17:02:53 2017 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Mon Jan 30 17:02:53 2017 -0500
----------------------------------------------------------------------
fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5f664cd7/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
index 2cc1eed..93c8a37 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
@@ -156,7 +156,7 @@ public class AdminUtil<T> {
/**
* Get locks that are held by non existent FATE transactions. These are table or namespace locks.
- *
+ *
* @return map where keys are transaction ids and values are a list of table IDs and/or namespace IDs. The transaction IDs are in the same format as
* transaction IDs in the Accumulo logs.
*/
@@ -166,7 +166,7 @@ public class AdminUtil<T> {
/**
* Get locks that are waiting to be aquired by non existent FATE transactions. These are table or namespace locks.
- *
+ *
* @return map where keys are transaction ids and values are a list of table IDs and/or namespace IDs. The transaction IDs are in the same format as
* transaction IDs in the Accumulo logs.
*/
[2/2] accumulo git commit: Merge branch '1.7' into 1.8
Posted by kt...@apache.org.
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/09fcd142
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/09fcd142
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/09fcd142
Branch: refs/heads/1.8
Commit: 09fcd142ee4279a4c726d40f16b82eb8dae89d18
Parents: 1f31ca6 5f664cd
Author: Keith Turner <kt...@apache.org>
Authored: Mon Jan 30 17:03:24 2017 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Mon Jan 30 17:03:24 2017 -0500
----------------------------------------------------------------------
fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------