Merge branch 'release_17.05' into dev

Conflicts: lib/galaxy/datatypes/registry.py lib/galaxy/jobs/__init__.py lib/galaxy/jobs/command_factory.py lib/galaxy/tools/actions/metadata.py lib/galaxy/tools/evaluation.py
galaxyproject · Sep 18, 2017 · ef602e1 · ef602e1
2 parents 8f337f6 + 03d9a9c
commit ef602e1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/galaxy/tools/actions/metadata.py b/lib/galaxy/tools/actions/metadata.py
@@ -88,7 +88,7 @@ def execute_via_app(self, tool, app, session_id, history_id, user=None,
                                                                      job_metadata=None,
                                                                      include_command=False,
                                                                      max_metadata_value_size=app.config.max_metadata_value_size,
-                                                                     kwds={'overwrite' : overwrite})
+                                                                     kwds={'overwrite': overwrite})
         incoming['__SET_EXTERNAL_METADATA_COMMAND_LINE__'] = cmd_line
         for name, value in tool.params_to_strings(incoming, app).items():
             job.add_parameter(name, value)