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
Joanne Hugé
slapos
Commits
2c739e76
Commit
2c739e76
authored
Mar 27, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'erp5'
parents
9563f965
9e672906
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+3
-3
stack/erp5/instance-memcached.cfg.in
stack/erp5/instance-memcached.cfg.in
+3
-3
No files found.
stack/erp5/buildout.cfg
View file @
2c739e76
...
@@ -290,7 +290,7 @@ extra-context =
...
@@ -290,7 +290,7 @@ extra-context =
[template-memcached]
[template-memcached]
< = template-jinja2-base
< = template-jinja2-base
filename = instance-memcached.cfg
filename = instance-memcached.cfg
md5sum =
2de1801236eb78651ecfd50ada46dd3b
md5sum =
346c864c1f119360eddb5e163f16d4f3
extra-context =
extra-context =
key dash_location dash:location
key dash_location dash:location
key dcron_location dcron:location
key dcron_location dcron:location
...
@@ -645,7 +645,7 @@ inotifyx = 0.2.0
...
@@ -645,7 +645,7 @@ inotifyx = 0.2.0
ipdb = 0.7
ipdb = 0.7
ipython = 0.13.1
ipython = 0.13.1
meld3 = 0.6.10
meld3 = 0.6.10
mr.developer = 1.2
4
mr.developer = 1.2
5
netaddr = 0.7.10
netaddr = 0.7.10
netifaces = 0.8
netifaces = 0.8
ordereddict = 1.1
ordereddict = 1.1
...
@@ -658,7 +658,7 @@ pyPdf = 1.13
...
@@ -658,7 +658,7 @@ pyPdf = 1.13
pyflakes = 0.6.1
pyflakes = 0.6.1
python-ldap = 2.4.10
python-ldap = 2.4.10
python-magic = 0.4.3
python-magic = 0.4.3
qrcode = 2.
4.2
qrcode = 2.
5.1
requests = 1.1.0
requests = 1.1.0
restkit = 4.2.1
restkit = 4.2.1
rtjp-eventlet = 0.3.2
rtjp-eventlet = 0.3.2
...
...
stack/erp5/instance-memcached.cfg.in
View file @
2c739e76
...
@@ -27,9 +27,9 @@ recipe = slapos.cookbook:generic.kumofs
...
@@ -27,9 +27,9 @@ recipe = slapos.cookbook:generic.kumofs
# Network options
# Network options
ip = ${slap-network-information:local-ipv4}
ip = ${slap-network-information:local-ipv4}
manager-port = 13
1
01
manager-port = 13
4
01
server-port = 13
2
01
server-port = 13
5
01
server-listen-port = 13
2
02
server-listen-port = 13
5
02
# previous memcached configuration
# previous memcached configuration
gateway-port = 11000
gateway-port = 11000
# previous memcached configuration
# previous memcached configuration
...
...
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