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
Thomas Gambier
slapos
Commits
c32f42e6
Commit
c32f42e6
authored
Jul 11, 2011
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into osoetraining
parents
db190d40
c7d6ebff
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
9 deletions
+22
-9
CHANGES.txt
CHANGES.txt
+8
-2
component/slapos/buildout.cfg
component/slapos/buildout.cfg
+6
-6
setup.py
setup.py
+1
-1
software/erp5/software.cfg
software/erp5/software.cfg
+1
-0
stack/shacache-client.cfg
stack/shacache-client.cfg
+6
-0
No files found.
CHANGES.txt
View file @
c32f42e6
0.12 (unreleased)
0.13 (unreleased)
================
* No change yet.
0.12 (2011-07-11)
=================
=================
* No changes yet.
* Fix slaprunner, phpmyadmin software releases, added
wordpress software release. [Cedric de Saint Martin]
0.11 (2011-07-07)
0.11 (2011-07-07)
=================
=================
...
...
component/slapos/buildout.cfg
View file @
c32f42e6
[buildout]
[buildout]
extends =
extends =
../../stack/shacache-client.cfg
../lxml-python/buildout.cfg
../lxml-python/buildout.cfg
../python-2.7/buildout.cfg
../python-2.7/buildout.cfg
...
@@ -32,20 +33,19 @@ eggs =
...
@@ -32,20 +33,19 @@ eggs =
zc.buildout = 1.5.3-dev-SlapOS-005
zc.buildout = 1.5.3-dev-SlapOS-005
Jinja2 = 2.5.5
Jinja2 = 2.5.5
Werkzeug = 0.6.2
Werkzeug = 0.6.2
buildout-versions = 1.6
hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.cmmi = 1.5.0
lxml = 2.3
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.
8
slapos.core = 0.
9
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.
8
# slapos.core==0.
9
Flask = 0.7.2
Flask = 0.7.2
# Required by:
# Required by:
...
@@ -53,13 +53,13 @@ Flask = 0.7.2
...
@@ -53,13 +53,13 @@ Flask = 0.7.2
hexagonit.recipe.download = 1.5.0
hexagonit.recipe.download = 1.5.0
# Required by:
# Required by:
# slapos.core==0.
8
# slapos.core==0.
9
netifaces = 0.5
netifaces = 0.5
# Required by:
# Required by:
# slapos.core==0.
8
# slapos.core==0.
9
supervisor = 3.0a10
supervisor = 3.0a10
# Required by:
# Required by:
# slapos.core==0.
8
# slapos.core==0.
9
zope.interface = 3.6.4
zope.interface = 3.6.4
setup.py
View file @
c32f42e6
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
import
glob
import
glob
import
os
import
os
version
=
'0.1
2
dev'
version
=
'0.1
3
dev'
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
"
...
...
software/erp5/software.cfg
View file @
c32f42e6
[buildout]
[buildout]
extends =
extends =
../../stack/shacache-client.cfg
../../stack/erp5.cfg
../../stack/erp5.cfg
versions = versions
versions = versions
...
...
stack/shacache-client.cfg
0 → 100644
View file @
c32f42e6
[buildout]
networkcache-section = networkcache
[networkcache]
download-cache-url = http://www.shacache.org/shacache
download-dir-url = http://www.shacache.org/shadir
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