From 4d3cfb9142be8884fa74a6a8b324df869e32ba30 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Thu, 12 Jan 2017 16:01:30 -0600
Subject: [PATCH] Release 3.7.0 cleanup

Change-Id: I75d9e2473461e316086cfad8c886c6b7d22ecd5e
---
 .../add-overwrite-option-to-router-7c50c8031dab6bae.yaml    | 5 ++---
 releasenotes/notes/bug-1652827-f59bbd1b64df958d.yaml        | 6 ++++++
 ...age-set-to-update-image-membership-68221f226ca3b6e0.yaml | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/bug-1652827-f59bbd1b64df958d.yaml

diff --git a/releasenotes/notes/add-overwrite-option-to-router-7c50c8031dab6bae.yaml b/releasenotes/notes/add-overwrite-option-to-router-7c50c8031dab6bae.yaml
index ac83b7e84..1b022cf13 100644
--- a/releasenotes/notes/add-overwrite-option-to-router-7c50c8031dab6bae.yaml
+++ b/releasenotes/notes/add-overwrite-option-to-router-7c50c8031dab6bae.yaml
@@ -1,7 +1,6 @@
 ---
 features:
   - |
-    Add support to overwrite routes in a router instance, using ``--router``
-    and ``--no-router`` option in ``osc router set``.
+    Add  ``--router`` and ``--no-router`` options to ``osc router set`` command to
+    modify routes in a router instance.
     [ Blueprint `allow-overwrite-set-options <https://blueprints.launchpad.net/python-openstackclient/+spec/allow-overwrite-set-options>`_]
-
diff --git a/releasenotes/notes/bug-1652827-f59bbd1b64df958d.yaml b/releasenotes/notes/bug-1652827-f59bbd1b64df958d.yaml
new file mode 100644
index 000000000..24991cbd1
--- /dev/null
+++ b/releasenotes/notes/bug-1652827-f59bbd1b64df958d.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fix an endpoint version problem with Image endpoints that contained the
+    substring 'v2'.
+    [Bug `1652827 <https://bugs.launchpad.net/bugs/1652827>`_]
diff --git a/releasenotes/notes/image-set-to-update-image-membership-68221f226ca3b6e0.yaml b/releasenotes/notes/image-set-to-update-image-membership-68221f226ca3b6e0.yaml
index 599216c47..6db63f871 100644
--- a/releasenotes/notes/image-set-to-update-image-membership-68221f226ca3b6e0.yaml
+++ b/releasenotes/notes/image-set-to-update-image-membership-68221f226ca3b6e0.yaml
@@ -1,4 +1,4 @@
 ---
 features:
-  - Add support to update image membership with the `--accept`,
+  - Add support to update image membership with the ``--accept``,
     ``--reject`` and ``--pending`` options of the ``image set command``.