.. changelog::
:version: 1.0.18
-
- .. change:: 3937
- :tags: bug, oracle
- :tickets: 3937
- :versions: 1.1.7
-
- A fix to cx_Oracle's WITH_UNICODE mode which was uncovered by the
- fact that cx_Oracle 5.3 now seems to hardcode this flag on in
- the build; an internal method that uses this mode wasn't using
- the correct signature.
+ :include_notes_from: unreleased_10
.. changelog::
--- /dev/null
+.. change:: 3937
+ :tags: bug, oracle
+ :tickets: 3937
+ :versions: 1.1.7
+
+ A fix to cx_Oracle's WITH_UNICODE mode which was uncovered by the
+ fact that cx_Oracle 5.3 now seems to hardcode this flag on in
+ the build; an internal method that uses this mode wasn't using
+ the correct signature.
--- /dev/null
+Individual per-changelog files go here
+in .rst format, which are pulled in by
+changelog (version 0.4.0 or higher) to
+be rendered into the changelog_xx.rst file.
+At release time, the files here are removed and written
+directly into the changelog.
+
+Rationale is so that multiple changes being merged
+into gerrit don't produce conflicts. Note that
+gerrit does not support custom merge handlers unlike
+git itself.
--- /dev/null
+Individual per-changelog files go here
+in .rst format, which are pulled in by
+changelog (version 0.4.0 or higher) to
+be rendered into the changelog_xx.rst file.
+At release time, the files here are removed and written
+directly into the changelog.
+
+Rationale is so that multiple changes being merged
+into gerrit don't produce conflicts. Note that
+gerrit does not support custom merge handlers unlike
+git itself.
+
--- /dev/null
+Individual per-changelog files go here
+in .rst format, which are pulled in by
+changelog (version 0.4.0 or higher) to
+be rendered into the changelog_xx.rst file.
+At release time, the files here are removed and written
+directly into the changelog.
+
+Rationale is so that multiple changes being merged
+into gerrit don't produce conflicts. Note that
+gerrit does not support custom merge handlers unlike
+git itself.
+