diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2017-09-22 20:13:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-22 20:13:39 +0200 |
| commit | 5d049e3cff73ccc7b6fc0e7259db0f3238592997 (patch) | |
| tree | 4738225b5fd79d5e780775a10f52a72273b0a192 /zkfacade | |
| parent | 33720727a40c18ba3be652bdaba7b0809eb3d606 (diff) | |
Revert "Freva/node admin shutdown"
Diffstat (limited to 'zkfacade')
| -rw-r--r-- | zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java index d3950e4c221..ccd02e5c6d6 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java @@ -4,8 +4,8 @@ package com.yahoo.vespa.curator.mock; import com.google.common.util.concurrent.UncheckedTimeoutException; import com.google.inject.Inject; import com.yahoo.collections.Pair; -import com.yahoo.concurrent.lock.Lock; -import com.yahoo.concurrent.lock.Locks; +import com.yahoo.concurrent.Lock; +import com.yahoo.concurrent.Locks; import com.yahoo.path.Path; import static com.yahoo.vespa.curator.mock.MemoryFileSystem.Node; |