Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
72094e45
Commit
72094e45
authored
Jan 22, 2015
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Plain Diff
Merge 'erp5-component' into erp5-cluster
parents
580fa92e
f28f7197
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
12 deletions
+16
-12
setup.py
setup.py
+1
-1
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+13
-9
stack/slapos.cfg
stack/slapos.cfg
+2
-2
No files found.
setup.py
View file @
72094e45
...
@@ -219,6 +219,6 @@ setup(name=name,
...
@@ -219,6 +219,6 @@ setup(name=name,
],
],
},
},
test_suite
=
'slapos.test'
,
test_suite
=
'slapos.test'
,
test
_requires
=
[
'jsonschema'
],
test
s_require
=
[
'jsonschema'
],
)
)
stack/erp5/buildout.cfg
View file @
72094e45
...
@@ -603,7 +603,7 @@ cloudooo = 1.2.5-dev
...
@@ -603,7 +603,7 @@ cloudooo = 1.2.5-dev
# use newer version than specified in ZTK
# use newer version than specified in ZTK
PasteDeploy = 1.5.2
PasteDeploy = 1.5.2
Pygments = 2.0.
1
Pygments = 2.0.
2
coverage = 3.7.1
coverage = 3.7.1
# test_UserManagerInterfaces in testERP5Security fails with 1.10.0.
# test_UserManagerInterfaces in testERP5Security fails with 1.10.0.
...
@@ -655,7 +655,7 @@ Pympler = 0.3.1
...
@@ -655,7 +655,7 @@ Pympler = 0.3.1
StructuredText = 2.11.1
StructuredText = 2.11.1
WSGIUtils = 0.7
WSGIUtils = 0.7
apache-libcloud = 0.16.0
apache-libcloud = 0.16.0
astroid = 1.3.
2
astroid = 1.3.
4
chardet = 2.3.0
chardet = 2.3.0
collective.recipe.template = 1.11
collective.recipe.template = 1.11
csp-eventlet = 0.7.0
csp-eventlet = 0.7.0
...
@@ -683,7 +683,7 @@ polib = 1.0.6
...
@@ -683,7 +683,7 @@ polib = 1.0.6
pprofile = 1.7.2
pprofile = 1.7.2
pycountry = 1.10
pycountry = 1.10
pyflakes = 0.8.1
pyflakes = 0.8.1
pylint = 1.4.
0
pylint = 1.4.
1
python-ldap = 2.4.19
python-ldap = 2.4.19
python-magic = 0.4.6
python-magic = 0.4.6
python-memcached = 1.53
python-memcached = 1.53
...
@@ -691,7 +691,7 @@ qrcode = 5.1
...
@@ -691,7 +691,7 @@ qrcode = 5.1
restkit = 4.2.2
restkit = 4.2.2
rtjp-eventlet = 0.3.2
rtjp-eventlet = 0.3.2
slapos.recipe.template = 2.6
slapos.recipe.template = 2.6
slapos.toolbox = 0.4
5.3
slapos.toolbox = 0.4
6.0
smmap = 0.9.0
smmap = 0.9.0
socketpool = 0.5.3
socketpool = 0.5.3
spyne = 2.11.0
spyne = 2.11.0
...
@@ -700,12 +700,12 @@ threadframe = 0.2
...
@@ -700,12 +700,12 @@ threadframe = 0.2
timerserver = 2.0.2
timerserver = 2.0.2
urlnorm = 1.1.2
urlnorm = 1.1.2
uuid = 1.30
uuid = 1.30
validictory = 1.0.0
a2
validictory = 1.0.0
xupdate-processor = 0.4
xupdate-processor = 0.4
xfw = 0.10
xfw = 0.10
# Required by:
# Required by:
# slapos.toolbox==0.4
5.3
# slapos.toolbox==0.4
6.0
GitPython = 0.3.5
GitPython = 0.3.5
# Required by:
# Required by:
...
@@ -713,11 +713,11 @@ GitPython = 0.3.5
...
@@ -713,11 +713,11 @@ GitPython = 0.3.5
Products.ZSQLMethods = 2.13.4
Products.ZSQLMethods = 2.13.4
# Required by:
# Required by:
# slapos.toolbox==0.4
5.3
# slapos.toolbox==0.4
6.0
atomize = 0.2.0
atomize = 0.2.0
# Required by:
# Required by:
# slapos.toolbox==0.4
5.3
# slapos.toolbox==0.4
6.0
feedparser = 5.1.3
feedparser = 5.1.3
# Required by:
# Required by:
...
@@ -725,7 +725,11 @@ feedparser = 5.1.3
...
@@ -725,7 +725,11 @@ feedparser = 5.1.3
fpconst = 0.7.2
fpconst = 0.7.2
# Required by:
# Required by:
# slapos.toolbox==0.45.3
# slapos.toolbox==0.46.0
lockfile = 0.10.2
# Required by:
# slapos.toolbox==0.46.0
paramiko = 1.15.2
paramiko = 1.15.2
# Required by:
# Required by:
...
...
stack/slapos.cfg
View file @
72094e45
...
@@ -107,7 +107,7 @@ zc.buildout = 1.7.1.post6
...
@@ -107,7 +107,7 @@ zc.buildout = 1.7.1.post6
# Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
# Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
zc.recipe.egg = 1.3.2.post2
zc.recipe.egg = 1.3.2.post2
# Use own version of h.r.download to be able to open .xz and .lz archives
# Use own version of h.r.download to be able to open .xz and .lz archives
hexagonit.recipe.download = 1.7
nxd003
hexagonit.recipe.download = 1.7
.post4
Jinja2 = 2.7.3
Jinja2 = 2.7.3
MarkupSafe = 0.23
MarkupSafe = 0.23
...
@@ -115,7 +115,7 @@ Werkzeug = 0.9.6
...
@@ -115,7 +115,7 @@ Werkzeug = 0.9.6
buildout-versions = 1.7
buildout-versions = 1.7
cffi = 0.8.6
cffi = 0.8.6
cmd2 = 0.6.8
cmd2 = 0.6.8
cryptography = 0.7.
1
cryptography = 0.7.
2
inotifyx = 0.2.2
inotifyx = 0.2.2
itsdangerous = 0.24
itsdangerous = 0.24
lxml = 3.4.1
lxml = 3.4.1
...
...
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