Merge changes from 3.3.x into main
We've been cherry picking from main into 3.3.x and 3.2.x but there were some
changes we've been making on those branches only so we're bringing them into
main.
diff --git a/.asf.yaml b/.asf.yaml
index 2e7f1c7..5ecb8c5 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -32,6 +32,12 @@
strict: true
contexts:
- continuous-integration/jenkins/pr-merge
+ 3.3.x:
+ required_status_checks:
+ strict: true
+ 3.2.x:
+ required_status_checks:
+ strict: true
3.1.x:
required_status_checks:
strict: true
diff --git a/dev/run b/dev/run
index fc1022c..8ac76b7 100755
--- a/dev/run
+++ b/dev/run
@@ -475,7 +475,6 @@
"server",
"nouveau.yaml",
]
-
logfname = os.path.join(ctx["devdir"], "logs", "nouveau.log")
log = open(logfname, "w")
return sp.Popen(
diff --git a/rel/reltool.config b/rel/reltool.config
index 4ff4c2c..41d45ef 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -12,7 +12,7 @@
{sys, [
{lib_dirs, ["../src"]},
- {rel, "couchdb", "3.3.1", [
+ {rel, "couchdb", "3.3.2", [
%% stdlib
asn1,
compiler,
diff --git a/src/docs/src/whatsnew/3.3.rst b/src/docs/src/whatsnew/3.3.rst
index d67a2e2..c84c49d 100644
--- a/src/docs/src/whatsnew/3.3.rst
+++ b/src/docs/src/whatsnew/3.3.rst
@@ -83,6 +83,7 @@
* :ghissue:`4347`: Remove failed ``couch_plugins`` experiment, fixes more
``undef`` errors.
* :ghissue:`4348`: Fix ``undef`` error in ``weatherreport``.
+* :ghissue:`4353`: Allow starting of more than one replication job. (D’OH!)
.. _release/3.3.0:
diff --git a/version.mk b/version.mk
index 86d2de6..c1c1f21 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
vsn_major=3
vsn_minor=3
-vsn_patch=1
+vsn_patch=2
