Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos-mynij-dev
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mynij
slapos-mynij-dev
Commits
cfce5320
Commit
cfce5320
authored
Jul 15, 2011
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
merge conflict : freeze versions
parents
dcc93a3b
9da90768
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
component/slapos/buildout.cfg
component/slapos/buildout.cfg
+6
-5
No files found.
component/slapos/buildout.cfg
View file @
cfce5320
...
@@ -47,14 +47,14 @@ lxml = 2.3
...
@@ -47,14 +47,14 @@ lxml = 2.3
meld3 = 0.6.7
meld3 = 0.6.7
netaddr = 0.7.5
netaddr = 0.7.5
setuptools = 0.6c12dev-r88846
setuptools = 0.6c12dev-r88846
slapos.core = 0.1
1
slapos.core = 0.1
2
slapos.libnetworkcache = 0.2
slapos.libnetworkcache = 0.2
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
z3c.recipe.scripts = 1.0.1
zc.recipe.egg = 1.3.2
zc.recipe.egg = 1.3.2
# Required by:
# Required by:
# slapos.core==0.1
1
# slapos.core==0.1
2
Flask = 0.7.2
Flask = 0.7.2
# Required by:
# Required by:
...
@@ -62,13 +62,14 @@ Flask = 0.7.2
...
@@ -62,13 +62,14 @@ Flask = 0.7.2
hexagonit.recipe.download = 1.5.0
hexagonit.recipe.download = 1.5.0
# Required by:
# Required by:
# slapos.core==0.1
1
# slapos.core==0.1
2
netifaces = 0.5
netifaces = 0.5
# Required by:
# Required by:
# slapos.core==0.1
1
# slapos.core==0.1
2
supervisor = 3.0a10
supervisor = 3.0a10
# Required by:
# Required by:
# slapos.core==0.1
1
# slapos.core==0.1
2
zope.interface = 3.6.4
zope.interface = 3.6.4
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