summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2011-03-14 09:33:14 +1000
committerDan Callaghan <dcallagh@redhat.com>2011-03-14 09:33:14 +1000
commitc45709976e643eff777f5ac60af3ddeb74a617fd (patch)
tree36d79eded4c51354948e2a2f356a52d0094bac8d
parenta6e8659f0f05b43c7b9c892a48f7096febdf6031 (diff)
parentfc1353d8cc89d12cfe48d433d1a51e2cbfdc4b0b (diff)
Merge remote-tracking branch 'origin/release-0.6.6' into developbeaker-distribution-inventory-1_1-41beaker-distribution-inventory-1_1-40
-rw-r--r--Server/bkr/server/static/javascript/priority_manager_v3.js (renamed from Server/bkr/server/static/javascript/priority_manager_v2.js)2
-rw-r--r--Server/bkr/server/templates/job.kid2
-rwxr-xr-xServer/bkr/server/tools/beakerd.py3
-rw-r--r--beaker.spec30
-rw-r--r--rel-eng/packages/beaker2
5 files changed, 32 insertions, 7 deletions
diff --git a/Server/bkr/server/static/javascript/priority_manager_v2.js b/Server/bkr/server/static/javascript/priority_manager_v3.js
index cf2e0e5..56edbda 100644
--- a/Server/bkr/server/static/javascript/priority_manager_v2.js
+++ b/Server/bkr/server/static/javascript/priority_manager_v3.js
@@ -29,7 +29,7 @@ PriorityManager.prototype.RecipeSetChanged = function(new_priority_id,recipeset_
"priority_id" : new_priority_id,
"recipeset_id" : recipeset_id }
AjaxLoader.prototype.add_loader('priority_recipeset_' + recipeset_id)
- var d = loadJSONDoc('/change_priority_recipeset' + "?" + queryString(params))
+ var d = loadJSONDoc('../change_priority_recipeset' + "?" + queryString(params))
// I wish we could just pass the callback var to priorityChanged
// Reason we can't is because it each call uses the same pointer value it seems!
d.addCallback(PriorityManager.prototype.priorityChanged,callback['function'],callback['args']['element_id'],callback['args']['value']) //mochikit's built in currying...
diff --git a/Server/bkr/server/templates/job.kid b/Server/bkr/server/templates/job.kid
index a314f3c..855ccfb 100644
--- a/Server/bkr/server/templates/job.kid
+++ b/Server/bkr/server/templates/job.kid
@@ -5,7 +5,7 @@
<head>
<meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
<script type="text/javascript" src="${tg.url('/static/javascript/master_slave_v2.js')}"></script>
- <script type="text/javascript" src="${tg.url('/static/javascript/priority_manager_v2.js')}"></script>
+ <script type="text/javascript" src="${tg.url('/static/javascript/priority_manager_v3.js')}"></script>
<script type="text/javascript" src="${tg.url('/static/javascript/rettag_manager_v2.js')}"></script>
<script type="text/javascript" src="${tg.url('/static/javascript/jquery.timers-1.2.js')}"></script>
<script type="text/javascript" src="${tg.url('/static/javascript/jquery.cookie.js')}"></script>
diff --git a/Server/bkr/server/tools/beakerd.py b/Server/bkr/server/tools/beakerd.py
index dc37f2e..5aadd63 100755
--- a/Server/bkr/server/tools/beakerd.py
+++ b/Server/bkr/server/tools/beakerd.py
@@ -273,6 +273,8 @@ def dead_recipes(*args):
)
)
+ if not recipes.count():
+ return False
log.debug("Entering dead_recipes routine")
for _recipe in recipes:
session.begin()
@@ -292,6 +294,7 @@ def dead_recipes(*args):
log.exception("Failed to commit due to :%s" % e)
session.close()
log.debug("Exiting dead_recipes routine")
+ return True
def queued_recipes(*args):
automated = SystemStatus.by_name(u'Automated')
diff --git a/beaker.spec b/beaker.spec
index 6d43e2b..5c2b280 100644
--- a/beaker.spec
+++ b/beaker.spec
@@ -2,8 +2,8 @@
%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: beaker
-Version: 0.6.5
-Release: 3%{?dist}
+Version: 0.6.6
+Release: 2%{?dist}
Summary: Filesystem layout for Beaker
Group: Applications/Internet
License: GPLv2+
@@ -98,8 +98,8 @@ Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
Requires: %{name}-lab-controller = %{version}-%{release}
Requires: %{name}-client = %{version}-%{release}
-Provides: beaker-redhat-support
-Obsoletes: beaker-redhat-support
+Provides: beaker-redhat-support-addDistro
+Obsoletes: beaker-redhat-support-addDistro
%description
Filesystem layout for beaker
@@ -247,6 +247,28 @@ fi
%{_var}/lib/beaker/addDistro.d/*
%changelog
+* Thu Mar 10 2011 Raymond Mancy <rmancy@redhat.com> 0.6.6-2
+- Fix typo in spec (rmancy@redhat.com)
+
+* Wed Mar 09 2011 Raymond Mancy <rmancy@redhat.com> 0.6.6-1
+- 679398 freeze header and first column for matrix report (rmancy@redhat.com)
+- 676735 Whiteboard filter results are now displayed in desc order (rmancy@redhat.com)
+- 678033 Export action for jobs (rmancy@redhat.com)
+- 676834 Job Ack/Nak between members of the same group (rmancy@redhat.com)
+- 679678 fix up priority attribute on <recipeSet/> (dcallagh@redhat.com)
+- 679232 redirect to /forbidden when permissions are insufficient
+ (dcallagh@redhat.com)
+- 678651 include addDistro.sh in beaker-lab-controller package (bpeck@redhat.com)
+- 572833 [RFE] Allow $swapsize to define swapsize (bpeck@redhat.com)
+- 681143 make bkradd omits requirements/runfor in Makefile that differ in case
+ (bpeck@redhat.com)
+- 668473 Jobs left in queued state forever (bpeck@redhat.com)
+- 679835 Drop version-release from task rpm names received from Scheduler
+ (bpeck@redhat.com)
+
+- 677905 XML-RPC method to return system history (dcallagh@redhat.com)
+
+
* Tue Mar 01 2011 Dan Callaghan <dcallagh@redhat.com> 0.6.5-3
- we can only be picky about TurboGears version on RHEL (dcallagh@redhat.com)
diff --git a/rel-eng/packages/beaker b/rel-eng/packages/beaker
index a70c3c1..0fcf1c9 100644
--- a/rel-eng/packages/beaker
+++ b/rel-eng/packages/beaker
@@ -1 +1 @@
-0.6.5-3 /
+0.6.6-2 /