Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 03c85737319dbce1a3c9aa258c7c22d2d97d5c35 https://github.com/galaxyproject/galaxy/commit/03c85737319dbce1a3c9aa258c7c2... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/history/multi-panel.js M static/maps/mvc/history/multi-panel.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/multi-panel.js Log Message: ----------- Multi-history: open rerun button in new tab Commit: e193e46e30d84d7f844a2941f72ed65af11f69b3 https://github.com/galaxyproject/galaxy/commit/e193e46e30d84d7f844a2941f72ed... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh Log Message: ----------- Place $headers before integrity_check PBS needs the resource selection (which will be filled in using $headers) to appear before anything else (except the shebang), so this changes the order. Commit: 434321915a61f53cd668170da076251a8c15889f https://github.com/galaxyproject/galaxy/commit/434321915a61f53cd668170da0762... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh Log Message: ----------- Use "$NCPUS" if defined to set GALAXY_SLOTS On our PBS cluster we do not have $PBS_NCPUS, and $PBS_NODEFILE contains the hostname of the nodes the task runs on. But we do have "$NCPUS" with the correct number of CPUS. Commit: 8e72b3095bacdac90a6fa7dea6125f489826bcfd https://github.com/galaxyproject/galaxy/commit/8e72b3095bacdac90a6fa7dea6125... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh Log Message: ----------- Merge pull request #2174 from mvdbeek/reorder_job_template [16.01] Backport #2146 #2145 Commit: 3e79a574bea53731c734b568e1c6eeab4199cbdd https://github.com/galaxyproject/galaxy/commit/3e79a574bea53731c734b568e1c6e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/history/multi-panel.js M static/maps/mvc/history/multi-panel.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/multi-panel.js Log Message: ----------- Merge #2167 manually to resolve conflicts. Commit: 9e278de3959200a1432cca6ba33bc6e7ddd89b60 https://github.com/galaxyproject/galaxy/commit/9e278de3959200a1432cca6ba33bc... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Rebuild client. Commit: 1c38b9723cc2ed8c42b55095484814e89e99b436 https://github.com/galaxyproject/galaxy/commit/1c38b9723cc2ed8c42b5509548481... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-04-15 (Fri, 15 Apr 2016) Changed paths: M client/galaxy/scripts/mvc/history/multi-panel.js M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh M static/maps/mvc/history/multi-panel.js.map M static/scripts/mvc/history/multi-panel.js Log Message: ----------- Merge 16.01->16.04 Compare: https://github.com/galaxyproject/galaxy/compare/7488e3b7be05...1c38b9723cc2