Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 29c78e984e52ac08b1b36a03e39b65c6edbe6200 https://github.com/galaxyproject/galaxy/commit/29c78e984e52ac08b1b36a03e39b6... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-08 (Tue, 08 Mar 2016) Changed paths: M run_reports.sh M run_tool_shed.sh Log Message: ----------- Fix virtualenv broken with #1847. Commit: 5824bc04af9270afbebcb2c8f9b6b3bea371b788 https://github.com/galaxyproject/galaxy/commit/5824bc04af9270afbebcb2c8f9b6b... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-08 (Tue, 08 Mar 2016) Changed paths: M run_reports.sh M run_tool_shed.sh Log Message: ----------- Fix duplicate print statement reported by @dannon... https://github.com/galaxyproject/galaxy/pull/1890#issuecomment-193873380 Commit: 438661e8945c1bb317f75dabe3db429ea779255d https://github.com/galaxyproject/galaxy/commit/438661e8945c1bb317f75dabe3db4... Author: John Chilton <jmchilton@gmail.com> Date: 2016-03-10 (Thu, 10 Mar 2016) Changed paths: M run_reports.sh M run_tool_shed.sh Log Message: ----------- Another fix for virtualenv fixes. Commit: 00a7c3af057c0689a53748802740bc2002df375c https://github.com/galaxyproject/galaxy/commit/00a7c3af057c0689a53748802740b... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-03-15 (Tue, 15 Mar 2016) Changed paths: M run_reports.sh M run_tool_shed.sh Log Message: ----------- Merge pull request #1890 from jmchilton/fix_virtualenvs [16.01] Fix virtual env handling broken with #1847. Commit: f277f99aed411fede7d1cb91d3177469922a58ae https://github.com/galaxyproject/galaxy/commit/f277f99aed411fede7d1cb91d3177... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M lib/galaxy/util/log/fluent_log.py Log Message: ----------- Fix handling of time in fluent logger. Commit: 87bcb5f5a1b6801e948b2cc0f5dc676c7faca682 https://github.com/galaxyproject/galaxy/commit/87bcb5f5a1b6801e948b2cc0f5dc6... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M lib/galaxy/util/log/fluent_log.py Log Message: ----------- Fix in a different way not requiring signature change; still not thrilled about overlapping kwarg names w/ stdlib module names. Commit: c8e48bfaccb5d10552df4200e616a9eee49206b0 https://github.com/galaxyproject/galaxy/commit/c8e48bfaccb5d10552df4200e616a... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M config/galaxy.ini.sample Log Message: ----------- Add fluentd configuration to galaxy.ini.sample Commit: 98c65dcee08338ea80a7e34251f8fa4ed6bd8dd5 https://github.com/galaxyproject/galaxy/commit/98c65dcee08338ea80a7e34251f8f... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M lib/galaxy/util/log/fluent_log.py M lib/galaxy/webapps/galaxy/api/metrics.py Log Message: ----------- Swap back to the first fix, update metrics api to use new signature. Commit: 19bf334c7763c2418408083b9a7369386e50ad66 https://github.com/galaxyproject/galaxy/commit/19bf334c7763c2418408083b9a736... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/util/log/fluent_log.py M lib/galaxy/webapps/galaxy/api/metrics.py Log Message: ----------- Merge pull request #1945 from dannon/fluent_logging_fix [16.01] Fix handling of time in fluent logger Commit: 53daf30dd284004c7e0b85ce8dbe6daf94622ef1 https://github.com/galaxyproject/galaxy/commit/53daf30dd284004c7e0b85ce8dbe6... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M config/galaxy.ini.sample M lib/galaxy/util/log/fluent_log.py M lib/galaxy/webapps/galaxy/api/metrics.py M run_reports.sh M run_tool_shed.sh Log Message: ----------- Merge branch 'release_16.01' into dev Compare: https://github.com/galaxyproject/galaxy/compare/6fff01c01c59...53daf30dd284