Merge branch 'v0.5.x'

Yelp · Jul 27, 2018 · 94e9f65 · 94e9f65
2 parents 280579a + 7b2ab17
commit 94e9f65
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -270,7 +270,6 @@ v0.6.0, 2017-11-01 -- wave of deprecation
      * removed scrape_options_into_new_groups()
 
 v0.5.12, 2018-07-24 -- v0.6.x backport
- * (released after v0.6.3)
  * dropped support for Python 2.6 and 3.3
  * termination protection doesn't make terminate-idle-clusters crash (#1802)
  * mrjob.parse.parse_s3_uri() handles s3a:// URIs (#1709)