From 4b8201ead55e0babcad7caa74b22457d88731178 Mon Sep 17 00:00:00 2001
From: Prashant Mital <prashantmital@gmail.com>
Date: Mon, 16 Nov 2020 15:37:38 -0800
Subject: [PATCH 1/2] BUMP 3.11.1

---
 doc/changelog.rst   | 19 ++++++++++++++++---
 pymongo/__init__.py |  2 +-
 setup.py            |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/doc/changelog.rst b/doc/changelog.rst
index 2143c18eac..4d709e9a4e 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -1,14 +1,27 @@
 Changelog
 =========
 
-Changes in Version 3.12.0
+Changes in Version 3.11.1
 -------------------------
 
-Version 3.12 adds support for Python 3.9 and includes a number of bug fixes.
+Version 3.11.1 adds support for Python 3.9 and includes a number of bugfixes.
 Highlights include:
 
 - Support for Python 3.9.
-- New method :class:`bson.json_util.JSONOptions.with_options`.
+- Initial support for Azure and GCP KMS providers for client side field level
+  encryption is in beta. See the docstring for
+  :class:`~pymongo.mongo_client.MongoClient`,
+  :class:`~pymongo.encryption_options.AutoEncryptionOpts`,
+  and :mod:`~pymongo.encryption`. **Note: Backwards-breaking changes may be
+  made before the final release.**
+- Fixed a bug where the :class:`bson.json_util.JSONOptions` API did not match
+  the class:`bson.codec_options.CodecOptions` API due to the absence of
+  a :meth:`bson.json_util.JSONOptions.with_options` method. This method has now
+  been added.
+- Fixed a bug wherein PyMongo did not always mark an implicit session
+  "dirty" after encountering a network error.
+- Fixed a bug which made it impossible to serialize
+  :class:`~pymongo.errors.BulkWriteError` instances using :mod:`pickle`.
 
 Issues Resolved
 ...............
diff --git a/pymongo/__init__.py b/pymongo/__init__.py
index 315ee2c5b6..399e6ba22e 100644
--- a/pymongo/__init__.py
+++ b/pymongo/__init__.py
@@ -74,7 +74,7 @@
 ALL = 2
 """Profile all operations."""
 
-version_tuple = (3, 11, 1, '.dev1')
+version_tuple = (3, 11, 1)
 
 def get_version_string():
     if isinstance(version_tuple[-1], str):
diff --git a/setup.py b/setup.py
index 28ab6f6a37..3bfcb15074 100755
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@
     except ImportError:
         _HAVE_SPHINX = False
 
-version = "3.11.1.dev1"
+version = "3.11.1"
 
 f = open("README.rst")
 try:

From cb182ce7ecb84c46d548d80a924d5bac6b4e1c17 Mon Sep 17 00:00:00 2001
From: Prashant Mital <prashantmital@gmail.com>
Date: Mon, 16 Nov 2020 15:50:32 -0800
Subject: [PATCH 2/2] update changelog

---
 doc/changelog.rst | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/doc/changelog.rst b/doc/changelog.rst
index 4d709e9a4e..5d37295825 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -15,21 +15,25 @@ Highlights include:
   and :mod:`~pymongo.encryption`. **Note: Backwards-breaking changes may be
   made before the final release.**
 - Fixed a bug where the :class:`bson.json_util.JSONOptions` API did not match
-  the class:`bson.codec_options.CodecOptions` API due to the absence of
+  the :class:`bson.codec_options.CodecOptions` API due to the absence of
   a :meth:`bson.json_util.JSONOptions.with_options` method. This method has now
   been added.
-- Fixed a bug wherein PyMongo did not always mark an implicit session
-  "dirty" after encountering a network error.
 - Fixed a bug which made it impossible to serialize
   :class:`~pymongo.errors.BulkWriteError` instances using :mod:`pickle`.
+- Fixed a bug wherein PyMongo did not always discard an implicit session after
+  encountering a network error.
+- Fixed a bug where connections created in the background were not
+  authenticated.
+- Fixed a memory leak in the :mod:`bson` module when using a
+  :class:`~bson.codec_options.TypeRegistry`.
 
 Issues Resolved
 ...............
 
-See the `PyMongo 3.12.0 release notes in JIRA`_ for the list of resolved issues
+See the `PyMongo 3.11.1 release notes in JIRA`_ for the list of resolved issues
 in this release.
 
-.. _PyMongo 3.12.0 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=29594
+.. _PyMongo 3.11.1 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=29997
 
 Changes in Version 3.11.0
 -------------------------