This is an automated email from the ASF dual-hosted git repository. mmerli pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/pulsar.git.
from 6393d4b fix flaky test (#14189) add 3e06571 PIP 45: Deprecate zookeeper settings (#14147) No new revisions were added by this update. Summary of changes: conf/broker.conf | 23 ++++-- conf/functions_worker.yml | 21 ++++- conf/proxy.conf | 16 +++- conf/standalone.conf | 28 +++++-- conf/websocket.conf | 17 +++- .../apache/pulsar/broker/ServiceConfiguration.java | 60 +++++++++++++-- .../broker/authorization/AuthorizationService.java | 20 ++--- .../PulsarConfigurationLoaderTest.java | 67 ++++++++++++++++ .../org/apache/pulsar/broker/PulsarService.java | 16 ++-- .../apache/pulsar/broker/admin/AdminResource.java | 2 +- .../pulsar/broker/admin/impl/NamespacesBase.java | 6 +- .../broker/admin/impl/PersistentTopicsBase.java | 2 +- .../broker/admin/impl/ResourceQuotasBase.java | 10 +-- .../broker/admin/v1/NonPersistentTopics.java | 4 +- .../broker/admin/v2/NonPersistentTopics.java | 2 +- .../pulsar/broker/namespace/NamespaceService.java | 8 +- .../pulsar/broker/namespace/OwnershipCache.java | 3 +- .../pulsar/broker/service/BrokerService.java | 2 +- .../pulsar/broker/web/PulsarWebResource.java | 12 +-- .../apache/pulsar/compaction/CompactorTool.java | 2 +- .../pulsar/broker/service/BkEnsemblesTestBase.java | 2 +- .../pulsar/functions/worker/WorkerConfig.java | 58 ++++++++++++-- .../pulsar/functions/config/TestWorkerConfig.java | 71 +++++++++++++++++ .../org/apache/pulsar/functions/worker/Worker.java | 2 +- .../functions/worker/rest/api/ComponentImpl.java | 12 +-- .../proxy/server/BrokerDiscoveryProvider.java | 2 +- .../pulsar/proxy/server/ProxyConfiguration.java | 39 ++++++++-- .../apache/pulsar/proxy/server/ProxyService.java | 4 +- .../proxy/server/ProxyConfigurationTest.java | 56 ++++++++++++++ .../apache/pulsar/websocket/WebSocketService.java | 2 +- .../service/WebSocketProxyConfiguration.java | 32 ++++++-- .../websocket/WebSocketProxyConfigurationTest.java | 90 ++++++++++++++++++++++ 32 files changed, 587 insertions(+), 104 deletions(-) create mode 100644 pulsar-websocket/src/test/java/org/apache/pulsar/websocket/WebSocketProxyConfigurationTest.java