Merge trunk

2011-02-09 16:52:48 -05:00 · 2011-02-09 16:52:48 -05:00 · b0b35af603
commit b0b35af603
parent ff8586d685 0d48cfb8c5
2 changed files with 2 additions and 0 deletions
--- a/doc/source/man/glancemanage.rst
+++ b/doc/source/man/glancemanage.rst
--- a/setup.py
+++ b/setup.py
@ -86,5 +86,7 @@ setup(
        'Environment :: No Input/Output (Daemon)',
    ],
    scripts=['bin/glance-api',
+             'bin/glance-combined',
+             'bin/glance-manage',
             'bin/glance-registry',
             'bin/glance-upload'])