From 2c88f4c00528012674745dc58ef891d47cca0637 Mon Sep 17 00:00:00 2001
From: Steve Linabery <slinaber@redhat.com>
Date: Jun 27 2012 15:23:11 +0000
Subject: Import upstream bugfix release 0.10.4


---

diff --git a/.gitignore b/.gitignore
index 132631f..6dcaee2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /aeolus-conductor-0.9.0.tar.gz
 /aeolus-conductor-0.10.1.tar.gz
 /aeolus-conductor-0.10.2.tar.gz
+/aeolus-conductor-0.10.4.tar.gz
diff --git a/aeolus-conductor.spec b/aeolus-conductor.spec
index 5fd4f24..7476d1a 100644
--- a/aeolus-conductor.spec
+++ b/aeolus-conductor.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:     aeolus-conductor
-Version:  0.10.2
+Version:  0.10.4
 Release:  1%{?dist}
 Summary:  The Aeolus Conductor
 
@@ -435,6 +435,12 @@ fi
 %files -n aeolus-all
 
 %changelog
+* Wed Jun 27 2012 Steve Linabery <slinaber@redhat.com> - 0.10.4-1
+- 3bb7de0 Fix filter_table for Ruby 1.9
+
+* Tue Jun 26 2012 Steve Linabery <slinaber@redhat.com> - 0.10.3-1
+- 91a1e06 BZ831577 - Fixed regression introduced by 796528
+
 * Fri Jun 15 2012 Steve Linabery <slinaber@redhat.com> - 0.10.2-1
 - a552589 Set aeolus user home directory to /usr/share/aeolus-conductor
 - 47f5639 Fix the filter view toggle after converge-ui layout changes
diff --git a/sources b/sources
index e300bb7..a839454 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee8d1d36cbd6983ef91046ae95755504  aeolus-conductor-0.10.2.tar.gz
+1e1a713e6e9160784dd55ade3c2b91ae  aeolus-conductor-0.10.4.tar.gz