diff options
| author | jaypipes@gmail.com <> | 2010-10-27 10:51:37 -0400 |
|---|---|---|
| committer | jaypipes@gmail.com <> | 2010-10-27 10:51:37 -0400 |
| commit | 24e19b43af5efe193bf28bed468e85ee57ce76df (patch) | |
| tree | 76b9f1e5ed0453e10e2e2d1a4784afd56fd0b035 /bin/nova-api | |
| parent | 198af0ef9e65bc4c2efe74b9d93cf40210eb77bc (diff) | |
| parent | eb82a8a7d8220adf31db3afb46849f24924ec973 (diff) | |
Merge trunk and resolve conflicts
Diffstat (limited to 'bin/nova-api')
| -rwxr-xr-x | bin/nova-api | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/nova-api b/bin/nova-api index a5027700b..20f1bd74f 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -39,6 +39,7 @@ from nova import server FLAGS = flags.FLAGS flags.DEFINE_integer('api_port', 8773, 'API port') + def main(_args): from nova import api from nova import wsgi |