Merge with the rest of 3.7.1

d32d449a · Jason R. Coombs · 16666484 · 0aea654b · d32d449a · d32d449a
Commit d32d449a authored Jun 14, 2014 by Jason R. Coombs
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

.hgtags .hgtags +1 -0

CHANGES.txt CHANGES.txt +6 -0

No files found.
--- a/.hgtags
+++ b/.hgtags
@@ -138,3 +138,4 @@ e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 292dfca15d33e72a862d044183a6ad7c06862a19 3.7b1
 49bd27eebf212c067392796bb2d0fa6d8e583586 3.7
 2fa97c06cc013a9c82f4c1219711e72238d5b6e6 3.8
+9b422fc0b8b97cdb62f02d754283f747adef7f83 3.7.1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======

+---------------
+3.7.1 and 3.8.1
+---------------
+
+* Issue #213: Use legacy StringIO behavior for compatibility under pbr.
+
 ---
 3.8
 ---