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
Kwabena Antwi-Boasiako
slapos
Commits
382d0eba
Commit
382d0eba
authored
Jun 07, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'erp5-component' into erp5
parents
cce04684
1dd26524
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
software/jio/instance.cfg.in
software/jio/instance.cfg.in
+2
-2
software/jio/software.cfg
software/jio/software.cfg
+1
-1
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
No files found.
software/jio/instance.cfg.in
View file @
382d0eba
...
@@ -47,6 +47,6 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio
...
@@ -47,6 +47,6 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio
[phantomjs-wrapper]
[phantomjs-wrapper]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
command-line = ${phantomjs:location}/
bin/phantomj
s
command-line = ${phantomjs:location}/
phantomjs-slapo
s
wrapper-path = $${directory:bin}/phantomjs
wrapper-path = $${directory:bin}/phantomjs
parameters_extra = true
parameters_extra = true
software/jio/software.cfg
View file @
382d0eba
...
@@ -43,7 +43,7 @@ recipe = slapos.recipe.template
...
@@ -43,7 +43,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
output = ${buildout:directory}/instance.cfg
# MD5 checksum can be skipped for development, but must be filled for production
# MD5 checksum can be skipped for development, but must be filled for production
md5sum =
1ef1bc6a3fb81300ce7139c512af96d
7
md5sum =
94421503ca09f77ee1e94e4b1ef4e6a
7
mode = 0644
mode = 0644
[jio-repository]
[jio-repository]
...
...
stack/erp5/buildout.cfg
View file @
382d0eba
...
@@ -647,7 +647,7 @@ greenlet = 0.4.0
...
@@ -647,7 +647,7 @@ greenlet = 0.4.0
hexagonit.recipe.cmmi = 1.6
hexagonit.recipe.cmmi = 1.6
http-parser = 0.8.1
http-parser = 0.8.1
huBarcode = 0.63
huBarcode = 0.63
inotifyx = 0.2.0
-1
inotifyx = 0.2.0
ipdb = 0.7
ipdb = 0.7
ipython = 0.13.2
ipython = 0.13.2
meld3 = 0.6.10
meld3 = 0.6.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