Release 0.3.3

BUG FIXES * Don't run merge detection on merged requests (rschlaikjer, #84, #91) * Fetch non-ff branches (rschlaikjer, #85, #90) IMPROVEMENTS * Manually rerun merge detection (rschlaikjer, #86, #92) PERFORMANCE TWEAKS * Separate git sha retrieval from git merge conflict detection. (rschlaikjer, #82, #83)
Yelp · Aug 18, 2014 · 67aa4d6 · 67aa4d6
1 parent 645dd1b
commit 67aa4d6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,19 @@
+0.3.3   Not released
+
+ BUG FIXES
+
+ * Don't run merge detection on merged requests (rschlaikjer, #84, #91)
+ * Fetch non-ff branches (rschlaikjer, #85, #90)
+
+ IMPROVEMENTS
+
+ * Manually rerun merge detection (rschlaikjer, #86, #92)
+
+ PERFORMANCE TWEAKS
+
+ * Separate git sha retrieval from git merge conflict detection.
+   (rschlaikjer, #82, #83)
+
 0.3.2   2014-08-15
 
  PERFORMANCE TWEAKS

diff --git a/pushmanager/__about__.py b/pushmanager/__about__.py
@@ -1,2 +1,2 @@
-__version_info__ = (0, 3, 2)
-__version__ = '%d.%d.%d' % __version_info__
+__version_info__ = (0, 3, 3, '-RC1')
+__version__ = '%d.%d.%d%s' % __version_info__