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/23 20:02:38 UTC
[helix] 03/20: Created Helix distributed lock design (apache#702)
This is an automated email from the ASF dual-hosted git repository.
jxue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
commit c05c4b41db6db058bf75d07be763899e486abff4
Author: Molly Gao <mg...@mgao-ld1.linkedin.biz>
AuthorDate: Thu Jan 23 11:30:59 2020 -0800
Created Helix distributed lock design (apache#702)
---
helix-lock/src/main/java/org/apache/helix/lock/HelixLock.java | 1 +
1 file changed, 1 insertion(+)
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 01ef63b..a04ac01 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
@@ -22,6 +22,7 @@ package org.apache.helix.lock;
/**
* Generic interface for Helix distributed lock
*/
+<<<<<<< HEAD
public interface HelixLock<T> {
/**
* Blocking call to acquire a lock