[aeolus-conductor/f17] Import upstream 0.10.6

[slinabery]

commit 8544db725e95fd13c570de59225a0bcd499465e8
Author: Steve Linabery <slinaber at redhat.com>
Date:   Thu Jul 26 17:44:30 2012 -0400

    Import upstream 0.10.6

 .gitignore            |    1 +
 aeolus-conductor.spec |   12 +++++++++++-
 sources               |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 593099c..05b9f1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /aeolus-conductor-0.10.2.tar.gz
 /aeolus-conductor-0.10.4.tar.gz
 /aeolus-conductor-0.10.5.tar.gz
+/aeolus-conductor-0.10.6.tar.gz
diff --git a/aeolus-conductor.spec b/aeolus-conductor.spec
index a28b9ca..a5ad0d3 100644
--- a/aeolus-conductor.spec
+++ b/aeolus-conductor.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:     aeolus-conductor
-Version:  0.10.5
+Version:  0.10.6
 Release:  1%{?dist}
 Summary:  The Aeolus Conductor
 
@@ -435,6 +435,16 @@ fi
 %files -n aeolus-all
 
 %changelog
+* Thu Jul 26 2012 Steve Linabery <slinaber at redhat.com> - 0.10.6-1
+- 4259424 838726 (2) - restrict what deployments can be stopped/removed
+- 91dc667 838726 (1) - mark 'new' instances as create_failed if deployment launch fails
+- e26305b BZ 833767 Fixed css in deployment#launch_time_params view
+- 5470012 BZ 831687 Fixed empty flash warning message on deployments#launch_time_params
+- 4bd8231 BZ 831687 Flash warning message fixed when it's empty
+- 2069a25 fixed bug in session_entites migration that was hit when there was invalid db data
+- 2ea37f1 Revert "838726 (1) - mark 'new' instances as create_failed if deployment launch fails"
+- 2b76d1d 838726 (1) - mark 'new' instances as create_failed if deployment launch fails
+
 * Fri Jun 29 2012 Steve Linabery <slinaber at redhat.com> - 0.10.5-1
 - cff2a4e https://bugzilla.redhat.com/show_bug.cgi?id=834632
 - 21bb090 BZ835151 configure errors after upgrade
diff --git a/sources b/sources
index 30cf029..6b654a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98af4d8f34ef6196f144e0e96b86c793  aeolus-conductor-0.10.5.tar.gz
+a092fbea0713cb41321d632fd61368c7  aeolus-conductor-0.10.6.tar.gz