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
Cédric Le Ninivin
slapos
Commits
9e801ac2
Commit
9e801ac2
authored
Apr 08, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into erp5-cluster
parents
fa2b3d41
4721c89b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
component/openssl/buildout.cfg
component/openssl/buildout.cfg
+2
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+9
-9
No files found.
component/openssl/buildout.cfg
View file @
9e801ac2
...
...
@@ -15,8 +15,8 @@ parts =
[openssl]
recipe = slapos.recipe.cmmi
url = https://www.openssl.org/source/openssl-1.0.1
f
.tar.gz
md5sum =
f26b09c028a0541cab33da697d522b25
url = https://www.openssl.org/source/openssl-1.0.1
g
.tar.gz
md5sum =
de62b43dfcd858e66a74bee1c834e959
depends =
${ca-certificates:version}
patch-binary = ${patch:location}/bin/patch
...
...
stack/erp5/buildout.cfg
View file @
9e801ac2
...
...
@@ -620,7 +620,7 @@ PasteDeploy = 1.5.2
Pygments = 1.6
argparse = 1.2.1
coverage = 3.7.1
lxml = 3.3.
3
lxml = 3.3.
4
mr.developer = 1.30
setuptools = 2.2
...
...
@@ -695,13 +695,13 @@ astroid = 1.0.1
async = 0.6.1
atomize = 0.2.0
chardet = 2.2.1
cliff = 1.
5.2
cliff = 1.
6.0
cmd2 = 0.6.7
csp-eventlet = 0.7.0
ecdsa = 0.11
elementtree = 1.2.7-20070827-preview
erp5.recipe.cmmiforcei686 = 0.1.3
erp5.util = 0.4.3
6
erp5.util = 0.4.3
7
erp5diff = 0.8.1.5
eventlet = 0.14.0
feedparser = 5.1.3
...
...
@@ -716,8 +716,8 @@ httplib2 = 0.8
iniparse = 0.4
inotifyx = 0.2.0-1
ipdb = 0.8
ipython =
1.2.1
itsdangerous = 0.2
3
ipython =
2.0.0
itsdangerous = 0.2
4
lock-file = 2.0
logilab-common = 0.61.0
meld3 = 0.6.10
...
...
@@ -726,7 +726,7 @@ minitage.core = 2.0.57
minitage.paste = 1.4.6
minitage.recipe.common = 1.90
minitage.recipe.egg = 1.107
netaddr = 0.7.1
0
netaddr = 0.7.1
1
netifaces = 0.8-1
ordereddict = 1.1
paramiko = 1.13.0
...
...
@@ -736,10 +736,10 @@ polib = 1.0.4
pprofile = 1.7.1
prettytable = 0.7.3-nxd001
psutil = 2.0.0
pyflakes = 0.
7.3
pyflakes = 0.
8.1
pylint = 1.1.0
pyparsing = 2.0.1
python-ldap = 2.4.1
4
python-ldap = 2.4.1
5
python-magic = 0.4.6
python-memcached = 1.53
qrcode = 4.0.4
...
...
@@ -754,7 +754,7 @@ slapos.toolbox = 0.39
smmap = 0.8.2
socketpool = 0.5.3
spyne = 2.10.10
stevedore = 0.1
4.1
stevedore = 0.1
5
suds = 0.4
supervisor = 3.0
threadframe = 0.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