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
Aurélien Vermylen
slapos
Commits
40720327
Commit
40720327
authored
Feb 20, 2018
by
Aurélien Vermylen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.0' into clearroad
parents
342b5393
58f2c3a6
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
83 additions
and
0 deletions
+83
-0
software/cloudooo/software.cfg
software/cloudooo/software.cfg
+7
-0
software/erp5/software.cfg
software/erp5/software.cfg
+10
-0
software/ipython_notebook/buildout.hash.cfg
software/ipython_notebook/buildout.hash.cfg
+39
-0
software/neoppod/software.cfg
software/neoppod/software.cfg
+7
-0
software/slapos-master/software.cfg
software/slapos-master/software.cfg
+9
-0
software/wendelin/software.cfg
software/wendelin/software.cfg
+11
-0
No files found.
software/cloudooo/software.cfg
View file @
40720327
...
@@ -20,3 +20,10 @@ ssl-dict-parameter-name = ssl
...
@@ -20,3 +20,10 @@ ssl-dict-parameter-name = ssl
mimetype-entry-addition-parameter-name = mimetype-entry-addition
mimetype-entry-addition-parameter-name = mimetype-entry-addition
#mimetype-entry-addition =
#mimetype-entry-addition =
# text/html application/pdf wkhtmltopdf
# text/html application/pdf wkhtmltopdf
# Test Suite: CLOUDOOO-MASTER ran at 2018/01/08 12:12:55.460627 UTC
# 1 failures, 2 errors, 200 total, status: FAIL
[cloudooo-repository]
branch = master
revision = 290f92fb700c6e04b515140cc45dcac1b4de18ccOA
software/erp5/software.cfg
View file @
40720327
...
@@ -2,3 +2,13 @@
...
@@ -2,3 +2,13 @@
extends =
extends =
../../stack/erp5/buildout.cfg
../../stack/erp5/buildout.cfg
# Test Suite: ERP5-MASTER ran at 2018/01/10 15:52:5.092649 UTC
# 5 failures, 0 errors, 5671 total, status: FAIL
[erp5]
revision = 1a48926e47191e0830515bbf8da407f0b2499747
[cloudooo-repository]
revision = 290f92fb700c6e04b515140cc45dcac1b4de18cc
branch = master
software/ipython_notebook/buildout.hash.cfg
0 → 100644
View file @
40720327
# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
# The only allowed lines here are (regexes):
# - "^#" comments, copied verbatim
# - "^[" section beginings, copied verbatim
# - lines containing an "=" sign which must fit in the following categorie.
# - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
# But avoid directories, they are not portable.
# Copied verbatim.
# - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
# by the re-generation script.
# Re-generated.
# - other lines are copied verbatim
# Substitution (${...:...}), extension ([buildout] extends = ...) and
# section inheritance (< = ...) are NOT supported (but you should really
# not need these here).
[instance-jupyter]
filename = instance.cfg.in
md5sum = 2c0ecc6f045504cb037709429132e08c
[ipython-notebook-config]
filename = template/ipython_notebook_config.py.jinja
md5sum = 95a76a80718e2a933dd4854dcf9a4a65
[ipython-notebook-set-password]
filename = template/ipython_set_password.cgi.jinja
md5sum = d7d4a7e19d55bf14007819258bf42100
[erp5-kernel]
filename = template/ERP5kernel.py.jinja
md5sum = f7be6c3ef9cdfaaea3b8756895a22081
[kernel-json]
filename = template/kernel.json.jinja
md5sum = ab6e78ea20855e07d388b5b86d1770fe
[custom-js]
filename = template/custom.js.jinja
md5sum = 584aa839aa20263ba885537b74c83abd
software/neoppod/software.cfg
View file @
40720327
...
@@ -33,6 +33,13 @@ recipe = zc.recipe.egg
...
@@ -33,6 +33,13 @@ recipe = zc.recipe.egg
eggs = erp5.util
eggs = erp5.util
interpreter = ${:_buildout_section_name_}
interpreter = ${:_buildout_section_name_}
# Test Suite: NEO-MASTER ran at 2018/01/08 12:24:10.882969 UTC
# 18 failures, 0 errors, 781 total, status: PASS
[neoppod]
revision = 875fc1b9376a4100acd00a8bdad7455d29a17fc1
[versions]
[versions]
erp5.util = 0.4.49
erp5.util = 0.4.49
# To match ERP5
# To match ERP5
...
...
software/slapos-master/software.cfg
View file @
40720327
...
@@ -58,5 +58,14 @@ filename = instance-balancer.cfg.in
...
@@ -58,5 +58,14 @@ filename = instance-balancer.cfg.in
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
filename = apache-backend.conf.in
filename = apache-backend.conf.in
# Test Suite: SLAPOS-MASTER-MASTER ran at 2018/01/10 11:49:5.979729 UTC
# 1 failures, 0 errors, 1243 total, status: FAIL
[erp5]
revision = b21bca1508cbdcd467779d389bf01f8ff5e2ef14
[vifib]
revision = 79626d6dbb929ac00a3aeba4ef713d65d894bd22
[versions]
[versions]
python-memcached = 1.47
python-memcached = 1.47
software/wendelin/software.cfg
View file @
40720327
...
@@ -84,6 +84,17 @@ git-executable = ${git:location}/bin/git
...
@@ -84,6 +84,17 @@ git-executable = ${git:location}/bin/git
repository = https://lab.nexedi.com/nexedi/wendelin.git
repository = https://lab.nexedi.com/nexedi/wendelin.git
branch = master
branch = master
# Test Suite: WENDELIN-MASTER-DEV ran at 2018/01/10 16:54:18.478460 UTC
# 0 failures, 0 errors, 10 total, status: PASS
[erp5]
revision = b70fcf9a7873350a59216cd666f2073c187da055
[wendelin]
revision = 56123b8d75bb7827b3f70864d4f9dca19d136ad6
[wendelin.core]
revision = 3cfc272896cbf281c0b327dfca6b95492205b008
[versions]
[versions]
msgpack-python = 0.4.8
msgpack-python = 0.4.8
wendelin.core = 0.11
wendelin.core = 0.11
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