Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e7ecab77349ee430d4d95978c7a71c0ae54b1d77 https://github.com/galaxyproject/galaxy/commit/e7ecab77349ee430d4d95978c7a71... Author: Dannon Baker dannon.baker@gmail.com Date: 2018-04-02 (Mon, 02 Apr 2018)

Changed paths: M scripts/common_startup.sh

Log Message: ----------- If psycopg2-binary is installed (as might be if switching between branches), uninstalling psycopg2 will leave psycopg2-binary installed but in a broken state. If we're removing psycopg2, we need to remove psycopg2-binary at the same time, leaving psycopg2-binary to be correctly installed afterwards.

Commit: 62338abbd61f7ca6b854ce0954c8cdebf2442c65 https://github.com/galaxyproject/galaxy/commit/62338abbd61f7ca6b854ce0954c8c... Author: Martin Cech marten@bx.psu.edu Date: 2018-04-02 (Mon, 02 Apr 2018)

Changed paths: M scripts/common_startup.sh

Log Message: ----------- Merge pull request #5825 from dannon/psycopg2-binary-handling-touchup

psycopg2-binary handling tweak

Compare: https://github.com/galaxyproject/galaxy/compare/30337f40d4bc...62338abbd61f