You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by wa...@apache.org on 2022/03/15 16:05:00 UTC

[pulsar] 04/13: Merge branch 'master' of https://github.com/apache/pulsar

This is an automated email from the ASF dual-hosted git repository.

wave pushed a commit to branch dave2wave-branch-14693
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit 42945e56fa235f086bace5b40cc7e144156d97d7
Merge: 6aeb408 fe32736
Author: Dave Fisher <da...@datastax.com>
AuthorDate: Tue Feb 1 09:14:09 2022 -0800

    Merge branch 'master' of https://github.com/apache/pulsar

 .github/workflows/ci-owasp-dep-check.yaml          |  94 +++++++++++++++++++++
 distribution/io/pom.xml                            |  25 ++++++
 distribution/pom.xml                               |   1 -
 pom.xml                                            |   1 +
 .../include/pulsar/ConsumerConfiguration.h         |  10 +--
 pulsar-client-cpp/lib/ConsumerConfiguration.cc     |   4 +-
 pulsar-client-cpp/lib/ConsumerConfigurationImpl.h  |   2 +-
 pulsar-client-cpp/lib/ConsumerImpl.cc              |   2 +-
 .../tests/ConsumerConfigurationTest.cc             |   8 +-
 pulsar-io/docs/pom.xml                             |  27 ++++++
 pulsar-io/flume/pom.xml                            |  27 ++++++
 pulsar-io/hbase/pom.xml                            |  27 ++++++
 pulsar-io/hdfs2/pom.xml                            |  29 ++++++-
 pulsar-io/hdfs3/pom.xml                            |  29 ++++++-
 pulsar-io/kafka/pom.xml                            |   5 ++
 pulsar-io/pom.xml                                  |   1 -
 pulsar-sql/pom.xml                                 |  28 ++++++
 site2/docs/administration-zk-bk.md                 |  26 ++----
 site2/docs/assets/zookeeper-batching.png           | Bin 0 -> 159664 bytes
 site2/docs/concepts-messaging.md                   |  39 ++++++---
 site2/docs/reference-configuration.md              |  27 +++---
 tiered-storage/file-system/pom.xml                 |  27 ++++++
 22 files changed, 383 insertions(+), 56 deletions(-)