Merge branch '2.12-dev'

pulp · Feb 23, 2017 · 35b2b50 · 35b2b50
2 parents 03bc9af + 810484d
commit 35b2b50
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/docs/user-guide/release-notes/2.12.x.rst b/docs/user-guide/release-notes/2.12.x.rst
@@ -17,6 +17,15 @@ this `blog post <http://pulpproject.org/2016/11/17/django14-epel6-retirement/>`_
 motivation for this decision.
 
 
+Pulp 2.12.1
+===========
+
+Bug Fixes
+---------
+
+See the list of :fixedbugs:`2.12.1`
+
+
 Pulp 2.12.0
 ===========
 

diff --git a/pulp.spec b/pulp.spec
@@ -1056,6 +1056,19 @@ Cert-based repo authentication for Pulp
 %endif # End pulp_server if block for repoauth
 
 %changelog
+* Thu Feb 23 2017 werwty <bihan.zh@gmail.com> 2.12.1-1
+- Pulp rebuild
+
+* Thu Feb 16 2017 Unknown name 2.12.1-0.1.beta
+- Pulp rebuild
+
+* Tue Jan 17 2017 Sean Myers <sean.myers@redhat.com> 2.12.0-0.1.beta
+- 752 - Fixed: Suggestion to add -v remains even if you use -v
+  (fdobrovo@redhat.com)
+- 1498 - logrotate for /var/log/pulp/*.log (pronix.service@gmail.com)
+- 1982 - Added --force-full option to importer pulp-admin (fdobrovo@redhat.com)
+- 1829 - Fixed repo list summary view (fdobrovo@redhat.com)
+
 * Wed Apr 06 2016 Sean Myers <sean.myers@redhat.com> 2.8.2-1
 - Pulp rebuild