Merge remote branch 'origin/introduce_slapos' into slapos

94bd7a7b · root · f5b9bbc7 · f647dad9 · 94bd7a7b
Commit 94bd7a7b authored Aug 17, 2012 by root
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

component/slapos/buildout.cfg component/slapos/buildout.cfg +1 -0

No files found.
--- a/component/slapos/buildout.cfg
+++ b/component/slapos/buildout.cfg
@@ -111,6 +111,7 @@ scripts =
  slapgrid-supervisorctl = slapos.grid.svcbackend:supervisorctl
  slapgrid-supervisord = slapos.grid.svcbackend:supervisord
  slapproxy = slapos.proxy:main
+  slapos = slapos.slapos:main

 [versions]
 zc.buildout = 1.6.0-dev-SlapOS-006