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
Klaus Wölfel
slapos
Commits
400ccad4
Commit
400ccad4
authored
Jun 04, 2015
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into erp5-cluster
parents
6555caf4
d0807d90
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
8 deletions
+2
-8
software/ipython_notebook/software.cfg
software/ipython_notebook/software.cfg
+1
-5
software/wendelin/software.cfg
software/wendelin/software.cfg
+0
-2
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
software/ipython_notebook/software.cfg
View file @
400ccad4
...
...
@@ -7,7 +7,6 @@ extends =
../../component/scipy/buildout.cfg
../../component/scikit-learn/buildout.cfg
../../component/pandas/buildout.cfg
../../component/manpy/buildout.cfg
../../component/openssl/buildout.cfg
parts =
monitor-eggs
...
...
@@ -23,9 +22,6 @@ eggs +=
${scipy:egg}
${pandas:egg}
${scikit-learn:egg}
${manpy:eggs}
initialization +=
${manpy:initialization}
[ipython_notebook_config]
recipe = hexagonit.recipe.download
...
...
software/wendelin/software.cfg
View file @
400ccad4
[buildout]
extends =
../../component/manpy/buildout.cfg
../../software/ipython_notebook/software.cfg
../../component/fluentd/buildout.cfg
../../component/matplotlib/buildout.cfg
...
...
@@ -22,7 +21,6 @@ parts +=
matplotlib
fluentd
ipython_notebook
manpy
[eggs]
initialization =
...
...
stack/slapos.cfg
View file @
400ccad4
...
...
@@ -105,7 +105,7 @@ eggs =
# Use SlapOS patched zc.buildout
zc.buildout = 1.7.1.post9
# Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
zc.recipe.egg = 1.3.2.post
3
zc.recipe.egg = 1.3.2.post
4
# Use own version of h.r.download to be able to open .xz and .lz archives
hexagonit.recipe.download = 1.7.post4
...
...
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