Branch: refs/heads/release_18.05 Home: https://github.com/galaxyproject/galaxy Commit: ce9b671bd4747cd29af9dc25074b0831bb3068e1 https://github.com/galaxyproject/galaxy/commit/ce9b671bd4747cd29af9dc25074b0... Author: Lance Parsons <lparsons@princeton.edu> Date: 2018-05-29 (Tue, 29 May 2018) Changed paths: M scripts/common_startup_functions.sh Log Message: ----------- Hack paster args to not duplicate pid file stuff for RUN_ALL. Commit: 88c94fc49b3f5869b6746bb0fe8f3248e33f440e https://github.com/galaxyproject/galaxy/commit/88c94fc49b3f5869b6746bb0fe8f3... Author: Lance Parsons <lparsons@princeton.edu> Date: 2018-05-31 (Thu, 31 May 2018) Changed paths: M scripts/common_startup_functions.sh Log Message: ----------- Set pid and log file for paster in server_args This avoids setting log and pid file in paster_args so that with GALAXY_RUN_ALL they can be set individually, but ensures they are set when running paster otherwise. Commit: b137d5cf3461d4d7edb10b8510e36aa02fce6797 https://github.com/galaxyproject/galaxy/commit/b137d5cf3461d4d7edb10b8510e36... Author: Dannon <dannon.baker@gmail.com> Date: 2018-05-31 (Thu, 31 May 2018) Changed paths: M scripts/common_startup_functions.sh Log Message: ----------- Merge pull request #6239 from lparsons/fix_paster_args [18.01] Hack paster args to not duplicate pid file stuff for RUN_ALL. Commit: 44b42e7e7e01c8471777cf87251499f3bbfbf3f9 https://github.com/galaxyproject/galaxy/commit/44b42e7e7e01c8471777cf8725149... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-05-31 (Thu, 31 May 2018) Changed paths: M scripts/common_startup_functions.sh Log Message: ----------- Merge remote-tracking branch 'upstream/release_18.01' into release_18.05 Compare: https://github.com/galaxyproject/galaxy/compare/c9641e1f1384...44b42e7e7e01 **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.