Merge pull request #10212 from certbot/candidate-2.11.1

Release 2.11.1
2026-06-03 22:08:07 -04:00 · 2025-02-25 17:04:25 -08:00 · 2025-02-25 17:04:25 -08:00 · 6ae2964875
commit 6ae2964875
parent ef1c6d8b85 6a8fbec76d
22 changed files with 41 additions and 25 deletions
--- a/.azure-pipelines/templates/stages/release-deploy-stage.yml
+++ b/.azure-pipelines/templates/stages/release-deploy-stage.yml
@ -1,9 +1,9 @@
 stages:
  - stage: Deploy
    jobs:
-      - template: ../jobs/common-deploy-jobs.yml
-        parameters:
-          snapReleaseChannel: beta
+      # - template: ../jobs/common-deploy-jobs.yml
+      #   parameters:
+      #     snapReleaseChannel: beta
      - job: create_github_release
        pool:
          vmImage: ubuntu-22.04
--- a/acme/docs/jws-help.txt
+++ b/acme/docs/jws-help.txt
@ -3,6 +3,6 @@ usage: jws [-h] [--compact] {sign,verify} ...
 positional arguments:
  {sign,verify}

-options:
+optional arguments:
  -h, --help     show this help message and exit
  --compact
--- a/acme/setup.py
+++ b/acme/setup.py
@ -3,7 +3,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'cryptography>=3.2.1',
--- a/certbot-apache/setup.py
+++ b/certbot-apache/setup.py
@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    # We specify the minimum acme and certbot version as the current plugin
--- a/certbot-compatibility-test/setup.py
+++ b/certbot-compatibility-test/setup.py
@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'certbot',
--- a/certbot-dns-cloudflare/setup.py
+++ b/certbot-dns-cloudflare/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    # for now, do not upgrade to cloudflare>=2.20 to avoid deprecation warnings and the breaking
--- a/certbot-dns-digitalocean/setup.py
+++ b/certbot-dns-digitalocean/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'python-digitalocean>=1.11', # 1.15.0 or newer is recommended for TTL support
--- a/certbot-dns-dnsimple/setup.py
+++ b/certbot-dns-dnsimple/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    # This version of lexicon is required to address the problem described in
--- a/certbot-dns-dnsmadeeasy/setup.py
+++ b/certbot-dns-dnsmadeeasy/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'dns-lexicon>=3.14.1',
--- a/certbot-dns-gehirn/setup.py
+++ b/certbot-dns-gehirn/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'dns-lexicon>=3.14.1',
--- a/certbot-dns-google/setup.py
+++ b/certbot-dns-google/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'google-api-python-client>=1.6.5',
--- a/certbot-dns-linode/setup.py
+++ b/certbot-dns-linode/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'dns-lexicon>=3.14.1',
--- a/certbot-dns-luadns/setup.py
+++ b/certbot-dns-luadns/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'dns-lexicon>=3.14.1',
--- a/certbot-dns-nsone/setup.py
+++ b/certbot-dns-nsone/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'dns-lexicon>=3.14.1',
--- a/certbot-dns-ovh/setup.py
+++ b/certbot-dns-ovh/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'dns-lexicon>=3.15.1',
--- a/certbot-dns-rfc2136/setup.py
+++ b/certbot-dns-rfc2136/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'dnspython>=1.15.0',
--- a/certbot-dns-route53/setup.py
+++ b/certbot-dns-route53/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'boto3>=1.15.15',
--- a/certbot-dns-sakuracloud/setup.py
+++ b/certbot-dns-sakuracloud/setup.py
@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    'dns-lexicon>=3.14.1',
--- a/certbot-nginx/setup.py
+++ b/certbot-nginx/setup.py
@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup

-version = '2.11.0'
+version = '2.11.2.dev0'

 install_requires = [
    # We specify the minimum acme and certbot version as the current plugin
--- a/certbot/CHANGELOG.md
+++ b/certbot/CHANGELOG.md
@ -2,7 +2,23 @@

 Certbot adheres to [Semantic Versioning](https://semver.org/).

-## 2.11.1 - main
+## 2.11.2 - master
+
+### Added
+
+*
+
+### Changed
+
+*
+
+### Fixed
+
+*
+
+More details about these changes can be found on our GitHub repo.
+
+## 2.11.1 - 2025-02-25

 ## Fixed

--- a/certbot/certbot/init.py
+++ b/certbot/certbot/init.py
@ -1,4 +1,4 @@
 """Certbot client."""

 # version number like 1.2.3a0, must have at least 2 parts, like 1.2
-__version__ = '2.11.0'
+__version__ = '2.11.2.dev0'
--- a/certbot/docs/cli-help.txt
+++ b/certbot/docs/cli-help.txt
@ -36,7 +36,7 @@ manage your account:
  --agree-tos       Agree to the ACME server's Subscriber Agreement
   -m EMAIL         Email address for important account notifications

-options:
+optional arguments:
  -h, --help            show this help message and exit
  -c CONFIG_FILE, --config CONFIG_FILE
                        path to config file (default: /etc/letsencrypt/cli.ini
@ -122,7 +122,7 @@ options:
                        case, and to know when to deprecate support for past
                        Python versions and flags. If you wish to hide this
                        information from the Let's Encrypt server, set this to
-                        "". (default: CertbotACMEClient/2.11.0 (certbot;
+                        "". (default: CertbotACMEClient/2.11.1 (certbot;
                        OS_NAME OS_VERSION) Authenticator/XXX Installer/YYY
                        (SUBCOMMAND; flags: FLAGS) Py/major.minor.patchlevel).
                        The flags encoded in the user agent are: --duplicate,