Release 1.6.0-dev-SlapOS-010

9f09b7b4 · Cédric de Saint Martin · d9303c7e · 9f09b7b4 · 9f09b7b4
Commit 9f09b7b4 authored Oct 01, 2012 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 15 additions and 1 deletion

CHANGES.SlapOS.txt CHANGES.SlapOS.txt +14 -0

setup.py setup.py +1 -1

No files found.
--- a/CHANGES.SlapOS.txt
+++ b/CHANGES.SlapOS.txt
+1.6.0-dev-SlapOS-010
+--------------------
+
+- Fix 1.6.0-dev-SlapOS-009 that was in a weird state:
+  Go back to 1.6.0-dev-SlapOS-008 and properly merge branches bug_1041249 and
+  serialisation.
+
+1.6.0-dev-SlapOS-009
+--------------------
+
+- Fix call to super() in AllowHostsPackageIndex (related to bug 1041249)
+- unserialize values _after_ loading _data (so they are not
+  overwritten) (related to serialisation)
+
 1.6.0-dev-SlapOS-008
 --------------------


--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 name = "zc.buildout"
-version = "1.6.0-dev-SlapOS-008"
+version = "1.6.0-dev-SlapOS-010"

 import os
 from setuptools import setup