Log In
beaker
Clone
Source Code
GIT
Source
Stats
Overview
Files
Commits
Branches
Forks
Releases
f4c60f0
Merge branch 'bz632675' into develop
Merged and Committed by
bpeck
13 years ago
raw
patch
tree
parents
90dd8d16ebeb9030fd9555c5fffe9e487c74b3b8
e653939101178f5bc93d702b2a07988a70376318
10 files changed.
339 lines added
.
37 lines removed
.
Common/bkr/upload.py
Server/bkr/server/upload.py
file renamed
+0
-0
LabController/proxy/proxy.conf
file modified
+7
-0
LabController/proxy/src/bkr/labcontroller/proxy.py
file modified
+125
-27
LabController/proxy/src/bkr/labcontroller/utils.py
file added
+49
Server/bkr/server/model.py
file modified
+49
-6
Server/bkr/server/recipes.py
file modified
+51
-1
Server/bkr/server/recipesets.py
file modified
+1
-1
Server/bkr/server/recipetasks.py
file modified
+33
-1
Tasks/distribution/beaker/setup/runtest.sh
file modified
+22
-0
beaker.spec
file modified
+2
-1
Merge branch 'bz632675' into develop
Common/bkr/upload.py
Server/bkr/server/upload.py
file renamed
file was renamed with no change to the file
LabController/proxy/proxy.conf
file modified
+7
-0
LabController/proxy/src/bkr/labcontroller/proxy.py
file modified
+125
-27
LabController/proxy/src/bkr/labcontroller/utils.py
file added
+49
Server/bkr/server/model.py
file modified
+49
-6
Server/bkr/server/recipes.py
file modified
+51
-1
Server/bkr/server/recipesets.py
file modified
+1
-1
Server/bkr/server/recipetasks.py
file modified
+33
-1
Tasks/distribution/beaker/setup/runtest.sh
file modified
+22
-0
beaker.spec
file modified
+2
-1