1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/060d5e65f5c5/ Changeset: 060d5e65f5c5 User: dannon Date: 2014-10-10 11:24:02+00:00 Summary: Merge from stable. Affected #: 3 files diff -r 5321b19715b144c7e93ae7567aa4a6681d3e59b7 -r 060d5e65f5c50709aa6139fe2c6fb64b263af7f1 .hgtags --- a/.hgtags +++ b/.hgtags @@ -19,3 +19,5 @@ 2a756ca2cb1826db7796018e77d12e2dd7b67603 latest_2014.02.10 ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 +2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 +bde1c35ef8e53d0436507c48ed9b08b1dc5b06a3 latest_2014.10.06 diff -r 5321b19715b144c7e93ae7567aa4a6681d3e59b7 -r 060d5e65f5c50709aa6139fe2c6fb64b263af7f1 lib/galaxy/webapps/galaxy/api/libraries.py --- a/lib/galaxy/webapps/galaxy/api/libraries.py +++ b/lib/galaxy/webapps/galaxy/api/libraries.py @@ -39,7 +39,7 @@ .. seealso:: :attr:`galaxy.model.Library.dict_collection_visible_keys` """ - deleted = kwd.get( 'deleted', None ) + deleted = util.string_as_bool_or_none( kwd.get( 'deleted', None ) ) query = self.library_manager.list( trans, deleted ) libraries = [] for library in query: diff -r 5321b19715b144c7e93ae7567aa4a6681d3e59b7 -r 060d5e65f5c50709aa6139fe2c6fb64b263af7f1 lib/tool_shed/metadata/repository_metadata_manager.py --- a/lib/tool_shed/metadata/repository_metadata_manager.py +++ b/lib/tool_shed/metadata/repository_metadata_manager.py @@ -5,6 +5,7 @@ from galaxy import util from galaxy.util import inflector from galaxy.web.form_builder import SelectField +from galaxy.model.orm import or_ from tool_shed.metadata import metadata_generator from tool_shed.repository_types.metadata import TipOnly 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.