summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Mancy <rmancy@redhat.com>2010-11-11 10:34:52 +1000
committerRaymond Mancy <rmancy@redhat.com>2010-11-11 10:34:52 +1000
commit3fd35fcdd17b494c94d8391dc24e8185da55c7a6 (patch)
tree6990ec7fbdd1c59ea48325f0dfa976e998253cb4
parent775ccc7aca9b9aed2affc1d4f5348a1f4a893612 (diff)
Automatic commit of package [beaker] release [0.5.61-2].beaker-0.5.61-2
-rw-r--r--beaker.spec2
-rw-r--r--rel-eng/packages/beaker2
2 files changed, 3 insertions, 1 deletions
diff --git a/beaker.spec b/beaker.spec
index 3790c65..d24f677 100644
--- a/beaker.spec
+++ b/beaker.spec
@@ -192,6 +192,8 @@ fi
%attr(-,apache,root) %dir %{_localstatedir}/run/%{name}-lab-controller
%changelog
+* Thu Nov 11 2010 Raymond Mancy <rmancy@redhat.com> 0.5.61-2
+- Merge branch 'release-0.5.60' into release-0.5.61 to ensure all changes from 60-2 are brought in (rmancy@redhat.com)
* Thu Nov 11 2010 Raymond Mancy <rmancy@redhat.com> 0.5.61-1
- bz644132 - Speed up searchbar (rmancy@redhat.com)
- bz650300 - require login for reporting system problems (dcallagh@redhat.com)
diff --git a/rel-eng/packages/beaker b/rel-eng/packages/beaker
index 12844f0..c921929 100644
--- a/rel-eng/packages/beaker
+++ b/rel-eng/packages/beaker
@@ -1 +1 @@
-0.5.61-1 /
+0.5.61-2 /