2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1744b7d8e9ab/ Changeset: 1744b7d8e9ab Branch: stable User: natefoo Date: 2014-10-14 00:48:30+00:00 Summary: Merge closed duplicate stable head with current stable. Affected #: 2 files diff -r 4a550ab8a4b2c0a45b48732edde703010a7c7509 -r 1744b7d8e9ab619d78c0516f9ccb093b0a814163 lib/galaxy/webapps/reports/buildapp.py --- a/lib/galaxy/webapps/reports/buildapp.py +++ b/lib/galaxy/webapps/reports/buildapp.py @@ -3,22 +3,19 @@ """ import logging, atexit -import os, os.path, sys +import os, os.path from inspect import isclass -from paste.request import parse_formvars -from paste.util import import_string from paste import httpexceptions import pkg_resources from galaxy.util import asbool -import config import galaxy.model import galaxy.model.mapping -import galaxy.web.framework +import galaxy.web.framework.webapp log = logging.getLogger( __name__ ) @@ -31,7 +28,6 @@ them to the webapp. """ from galaxy.web.base.controller import BaseUIController - from galaxy.web.base.controller import ControllerUnavailable import galaxy.webapps.reports.controllers controller_dir = galaxy.webapps.reports.controllers.__path__[0] for fname in os.listdir( controller_dir ): https://bitbucket.org/galaxy/galaxy-central/commits/dbee027f7410/ Changeset: dbee027f7410 User: natefoo Date: 2014-10-14 00:49:02+00:00 Summary: Merge stable. Affected #: 2 files diff -r 3f42dfab2cee4706551c9ca0211e7cd08e35058b -r dbee027f74101741533851ce2634b60adca4c454 .hgtags --- a/.hgtags +++ b/.hgtags @@ -20,4 +20,4 @@ ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 -0f70d302b85e2a74d6c0c9ec7d4ccc6f11787eac latest_2014.10.06 +cb0c2ea402e4c82c7872177e874ce59de29c9c13 latest_2014.10.06 diff -r 3f42dfab2cee4706551c9ca0211e7cd08e35058b -r dbee027f74101741533851ce2634b60adca4c454 lib/galaxy/webapps/reports/buildapp.py --- a/lib/galaxy/webapps/reports/buildapp.py +++ b/lib/galaxy/webapps/reports/buildapp.py @@ -3,22 +3,19 @@ """ import logging, atexit -import os, os.path, sys +import os, os.path from inspect import isclass -from paste.request import parse_formvars -from paste.util import import_string from paste import httpexceptions import pkg_resources from galaxy.util import asbool -import config import galaxy.model import galaxy.model.mapping -import galaxy.web.framework +import galaxy.web.framework.webapp log = logging.getLogger( __name__ ) @@ -31,7 +28,6 @@ them to the webapp. """ from galaxy.web.base.controller import BaseUIController - from galaxy.web.base.controller import ControllerUnavailable import galaxy.webapps.reports.controllers controller_dir = galaxy.webapps.reports.controllers.__path__[0] for fname in os.listdir( controller_dir ): 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.