Merge remote-tracking branch 'origin/proxy_instance_guid'

0fd8edaf · Marco Mariani · 5a2a0d57 · 4460e287 · 0fd8edaf
Commit 0fd8edaf authored Nov 27, 2012 by Marco Mariani
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

CHANGES.txt CHANGES.txt +7 -0

No files found.
--- a/CHANGES.txt
+++ b/CHANGES.txt
 Changes
 =======

+0.33.x (unreleased)
+-------------------
+
+ * slapproxy: Filter by instance_guid, allow computer partition renames
+              and change of software_type and requested_state [Marco Mariani]
+ * slapproxy: Stop instance even if buildout/reporting is wrong [Cedric de Saint Martin]
+
 0.33.1 (2012-11-05)
 -------------------