Browse files

Merge branch 'master' into dev

Conflicts:
	gondor/__main__.py
  • Loading branch information...
2 parents 9e1b6dd + 93bb081 commit 9b333fd04cf1377710f75469718e0fc918dad7b4 @brosner brosner committed May 20, 2012
Showing with 2 additions and 1 deletion.
  1. +1 −0 CHANGELOG.rst
  2. +1 −1 gondor/__main__.py
View
1 CHANGELOG.rst
@@ -16,6 +16,7 @@ CHANGELOG
* improved path handling of file argument to database:load
* fixed formatting of errors when deploying
+ * gondor run no longer needs -- to delimit run options from command options
1.0.5
=====
View
2 gondor/__main__.py
@@ -826,7 +826,7 @@ def main():
# cmd: run
parser_run = command_parsers.add_parser("run")
parser_run.add_argument("instance_label", nargs=1)
- parser_run.add_argument("command_", nargs="+")
+ parser_run.add_argument("command_", nargs=argparse.REMAINDER)
# cmd: delete
parser_delete = command_parsers.add_parser("delete")

0 comments on commit 9b333fd

Please sign in to comment.