You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by jx...@apache.org on 2020/04/14 02:30:17 UTC
[helix] 04/19: Added LockInfo interface
This is an automated email from the ASF dual-hosted git repository.
jxue pushed a commit to branch distributed-lock
in repository https://gitbox.apache.org/repos/asf/helix.git
commit df5b89c00f8fa2d91df49741fa505af9f465a914
Author: Molly Gao <mg...@mgao-mn1.linkedin.biz>
AuthorDate: Fri Jan 24 15:33:04 2020 -0800
Added LockInfo interface
---
helix-lock/src/main/java/org/apache/helix/lock/HelixLock.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/helix-lock/src/main/java/org/apache/helix/lock/HelixLock.java b/helix-lock/src/main/java/org/apache/helix/lock/HelixLock.java
index a04ac01..d163718 100644
--- a/helix-lock/src/main/java/org/apache/helix/lock/HelixLock.java
+++ b/helix-lock/src/main/java/org/apache/helix/lock/HelixLock.java
@@ -20,9 +20,8 @@ package org.apache.helix.lock;
*/
/**
- * Generic interface for Helix distributed lock
+ * Generic interface for Helix distributed lock for both nonblocking and blocking calls
*/
-<<<<<<< HEAD
public interface HelixLock<T> {
/**
* Blocking call to acquire a lock