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
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
Nirina Malard
slapos
Commits
44750c3c
Commit
44750c3c
authored
Jul 07, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into erp5
parents
ccc3c726
91c5be12
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
6 deletions
+23
-6
CHANGES.txt
CHANGES.txt
+7
-1
component/slapos/buildout.cfg
component/slapos/buildout.cfg
+9
-4
setup.py
setup.py
+1
-1
software/erp5testnode/software.cfg
software/erp5testnode/software.cfg
+5
-0
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+1
-0
No files found.
CHANGES.txt
View file @
44750c3c
0.10 (unreleased)
0.11 (not yet released)
================
* No change yet.
0.10 (2011-07-01)
================
* Add PHPMyAdmin software release used in SlapOS tutorials
[Cedric de Saint Martin]
* Add slaprunner software release [Cedric de Saint Martin]
0.9 (2011-06-24)
================
...
...
component/slapos/buildout.cfg
View file @
44750c3c
...
...
@@ -11,6 +11,11 @@ find-links =
versions = versions
# separate from system python
include-site-packages = false
exec-sitecustomize = false
allowed-eggs-from-site-packages =
[lxml-python]
python = python2.7
...
...
@@ -24,7 +29,7 @@ eggs =
slapos.core
[versions]
zc.buildout = 1.5.3-dev-SlapOS-00
4
zc.buildout = 1.5.3-dev-SlapOS-00
5
Jinja2 = 2.5.5
Werkzeug = 0.6.2
buildout-versions = 1.6
...
...
@@ -34,14 +39,14 @@ meld3 = 0.6.7
netaddr = 0.7.5
setuptools = 0.6c12dev-r88846
slapos.core = 0.8
slapos.libnetworkcache = 0.
1
slapos.libnetworkcache = 0.
2
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
zc.recipe.egg = 1.3.2
# Required by:
# slapos.core==0.8
Flask = 0.
6.1
Flask = 0.
7.2
# Required by:
# hexagonit.recipe.cmmi==1.5.0
...
...
@@ -57,4 +62,4 @@ supervisor = 3.0a10
# Required by:
# slapos.core==0.8
zope.interface = 3.6.
3
zope.interface = 3.6.
4
setup.py
View file @
44750c3c
...
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
import
glob
import
os
version
=
'0.1
0
dev'
version
=
'0.1
1
dev'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
...
...
software/erp5testnode/software.cfg
View file @
44750c3c
...
...
@@ -8,6 +8,11 @@ find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/
http://dist.repoze.org
http://www.nexedi.org/static/packages/source/
# Separate from site eggs
allowed-eggs-from-site-packages =
include-site-packages = false
exec-sitecustomize = false
versions = versions
rebootstrap-section = python2.6
...
...
software/slaprunner/software.cfg
View file @
44750c3c
...
...
@@ -31,6 +31,7 @@ md5sum = 04b17b8665eb4e11ce3a4661ad98e5e3
[eggs]
eggs +=
slapos.toolbox
slapos.core
[versions]
slapos.cookbook = 0.10
...
...
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