diff options
author | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
---|---|---|
committer | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
commit | 567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch) | |
tree | 4664a743e166a5e11aee7b9acd70ad8ee2617612 /zkfacade/src/main/java/org/apache/zookeeper | |
parent | e9058b555d4dfea2f6c872d9a677e8678b569569 (diff) | |
parent | bce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff) |
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'zkfacade/src/main/java/org/apache/zookeeper')
5 files changed, 8 insertions, 8 deletions
diff --git a/zkfacade/src/main/java/org/apache/zookeeper/client/package-info.java b/zkfacade/src/main/java/org/apache/zookeeper/client/package-info.java index e6b860f5f5c..f5155e0b321 100644 --- a/zkfacade/src/main/java/org/apache/zookeeper/client/package-info.java +++ b/zkfacade/src/main/java/org/apache/zookeeper/client/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * Required for export of {@link org.apache.zookeeper.client.ZKClientConfig}. * @@ -7,4 +7,4 @@ @ExportPackage package org.apache.zookeeper.client; -import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file +import com.yahoo.osgi.annotation.ExportPackage; diff --git a/zkfacade/src/main/java/org/apache/zookeeper/common/package-info.java b/zkfacade/src/main/java/org/apache/zookeeper/common/package-info.java index 2b81622fb42..8e85526427f 100644 --- a/zkfacade/src/main/java/org/apache/zookeeper/common/package-info.java +++ b/zkfacade/src/main/java/org/apache/zookeeper/common/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * Required for export of {@link org.apache.zookeeper.client.ZKClientConfig} (which inherits from {@link org.apache.zookeeper.common.ZKConfig}). * @@ -7,4 +7,4 @@ @ExportPackage package org.apache.zookeeper.common; -import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file +import com.yahoo.osgi.annotation.ExportPackage; diff --git a/zkfacade/src/main/java/org/apache/zookeeper/data/package-info.java b/zkfacade/src/main/java/org/apache/zookeeper/data/package-info.java index 0fe587931fa..350276cfdef 100644 --- a/zkfacade/src/main/java/org/apache/zookeeper/data/package-info.java +++ b/zkfacade/src/main/java/org/apache/zookeeper/data/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage(version = @Version(major = 3, minor = 4, micro = 6)) package org.apache.zookeeper.data; diff --git a/zkfacade/src/main/java/org/apache/zookeeper/package-info.java b/zkfacade/src/main/java/org/apache/zookeeper/package-info.java index 9585d391ce1..caeb57c7890 100644 --- a/zkfacade/src/main/java/org/apache/zookeeper/package-info.java +++ b/zkfacade/src/main/java/org/apache/zookeeper/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage(version = @Version(major = 3, minor = 4, micro = 6)) package org.apache.zookeeper; diff --git a/zkfacade/src/main/java/org/apache/zookeeper/server/quorum/package-info.java b/zkfacade/src/main/java/org/apache/zookeeper/server/quorum/package-info.java index eaabdbf7a52..74eba6e3583 100644 --- a/zkfacade/src/main/java/org/apache/zookeeper/server/quorum/package-info.java +++ b/zkfacade/src/main/java/org/apache/zookeeper/server/quorum/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * Required for export of {@link org.apache.zookeeper.client.ZKClientConfig} (which inherits from {@link org.apache.zookeeper.common.ZKConfig}). * @@ -7,4 +7,4 @@ @ExportPackage package org.apache.zookeeper.server.quorum; -import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file +import com.yahoo.osgi.annotation.ExportPackage; |