2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/6704c0ee9fec/ Changeset: 6704c0ee9fec Branch: next-stable User: dannon Date: 2014-12-15 13:23:47+00:00 Summary: Bugfix for openid configuration locations, pointed out by Jelle in https://trello.com/c/AwZwAx4l/2289-lib-galaxy-config-py-missing-comma-on-ope... Affected #: 1 file diff -r 7a027f285f3b441f8ff1fe48dfc5841d8bc41bfa -r 6704c0ee9fec6b0624d739669cb7c66ea08d480a lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -445,7 +445,7 @@ job_resource_params_file = [ 'config/job_resource_params_conf.xml', 'job_resource_params_conf.xml' ], migrated_tools_config = [ 'migrated_tools_conf.xml', 'config/migrated_tools_conf.xml' ], object_store_config_file = [ 'config/object_store_conf.xml', 'object_store_conf.xml' ], - openid_config_file = [ 'config/openid_conf.xml', 'openid_conf.xml' 'config/openid_conf.xml.sample' ], + openid_config_file = [ 'config/openid_conf.xml', 'openid_conf.xml', 'config/openid_conf.xml.sample' ], shed_data_manager_config_file = [ 'shed_data_manager_conf.xml', 'config/shed_data_manager_conf.xml' ], shed_tool_data_table_config = [ 'shed_tool_data_table_conf.xml', 'config/shed_tool_data_table_conf.xml' ], tool_sheds_config_file = [ 'config/tool_sheds_conf.xml', 'tool_sheds_conf.xml', 'config/tool_sheds_conf.xml.sample' ], https://bitbucket.org/galaxy/galaxy-central/commits/6fee59d63b7e/ Changeset: 6fee59d63b7e User: dannon Date: 2014-12-15 13:23:47+00:00 Summary: Bugfix for openid configuration locations, pointed out by Jelle in https://trello.com/c/AwZwAx4l/2289-lib-galaxy-config-py-missing-comma-on-ope... Affected #: 1 file diff -r ad28e42a8af34c81f0ebcbe6f3baef9bdcf80ae8 -r 6fee59d63b7e042851b2a63e4d66ad6dde630e3b lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -451,7 +451,7 @@ job_resource_params_file = [ 'config/job_resource_params_conf.xml', 'job_resource_params_conf.xml' ], migrated_tools_config = [ 'migrated_tools_conf.xml', 'config/migrated_tools_conf.xml' ], object_store_config_file = [ 'config/object_store_conf.xml', 'object_store_conf.xml' ], - openid_config_file = [ 'config/openid_conf.xml', 'openid_conf.xml' 'config/openid_conf.xml.sample' ], + openid_config_file = [ 'config/openid_conf.xml', 'openid_conf.xml', 'config/openid_conf.xml.sample' ], shed_data_manager_config_file = [ 'shed_data_manager_conf.xml', 'config/shed_data_manager_conf.xml' ], shed_tool_data_table_config = [ 'shed_tool_data_table_conf.xml', 'config/shed_tool_data_table_conf.xml' ], tool_sheds_config_file = [ 'config/tool_sheds_conf.xml', 'tool_sheds_conf.xml', 'config/tool_sheds_conf.xml.sample' ], Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.