Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jean-Paul Smets
slapos
Commits
00475e7e
Commit
00475e7e
authored
Nov 21, 2014
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! request: drop redundant 'config' & 'sla' options
Sorry everyone for this mistake.
parent
f01d86f9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
setup.py
setup.py
+1
-1
slapos/recipe/request.py
slapos/recipe/request.py
+2
-2
stack/resilient/buildout.cfg
stack/resilient/buildout.cfg
+1
-1
No files found.
setup.py
View file @
00475e7e
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import
glob
import
glob
import
os
import
os
version
=
'0.9
1
'
version
=
'0.9
2
'
name
=
'slapos.cookbook'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
...
...
slapos/recipe/request.py
View file @
00475e7e
...
@@ -107,10 +107,10 @@ class Recipe(object):
...
@@ -107,10 +107,10 @@ class Recipe(object):
if
'config'
in
options
or
'sla'
in
options
:
if
'config'
in
options
or
'sla'
in
options
:
raise
UserError
(
"'config' & 'sla' options are obsolete."
raise
UserError
(
"'config' & 'sla' options are obsolete."
" Clean up your software release."
)
" Clean up your software release."
)
filter_kw
=
{
k
:
v
filter_kw
=
{
k
[
4
:]
:
v
for
k
,
v
in
options
.
iteritems
()
for
k
,
v
in
options
.
iteritems
()
if
k
.
startswith
(
'sla-'
)
and
v
}
if
k
.
startswith
(
'sla-'
)
and
v
}
partition_parameter_kw
=
self
.
_filterForStorage
({
k
:
v
partition_parameter_kw
=
self
.
_filterForStorage
({
k
[
7
:]
:
v
for
k
,
v
in
options
.
iteritems
()
for
k
,
v
in
options
.
iteritems
()
if
k
.
startswith
(
'config-'
)})
if
k
.
startswith
(
'config-'
)})
slave
=
options
.
get
(
'slave'
,
'false'
).
lower
()
in
\
slave
=
options
.
get
(
'slave'
,
'false'
).
lower
()
in
\
...
...
stack/resilient/buildout.cfg
View file @
00475e7e
...
@@ -126,6 +126,6 @@ Jinja2 = 2.6
...
@@ -126,6 +126,6 @@ Jinja2 = 2.6
# ... And newer s.r.template requires Jinja2 >= 2.7
# ... And newer s.r.template requires Jinja2 >= 2.7
slapos.recipe.template = 2.4.2
slapos.recipe.template = 2.4.2
rdiff-backup = 1.3.4nxd2
rdiff-backup = 1.3.4nxd2
slapos.cookbook = 0.9
1
slapos.cookbook = 0.9
2
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment