Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3cca45b2bb570bb213d9a77764d606633aea7cfc https://github.com/galaxyproject/galaxy/commit/3cca45b2bb570bb213d9a77764d60... Author: John Chilton <jmchilton@gmail.com> Date: 2017-01-25 (Wed, 25 Jan 2017) Changed paths: M doc/source/admin/conda_faq.rst M doc/source/admin/dependency_resolvers.rst Log Message: ----------- Dependency resolver documentation revisions. - Add documentation for cached dependency management as solution to LOCKERRORS. - Add documentation for overcoming problems with hard links. (Different approaches) - Add documentation on upgrading Conda as needed. - Correct and fill out documentation of defaults. - Fix some bugs in the Galaxy packages documentation. - Expand Galaxy package documentation to include a simpler example. - Update Conda configuration option documentation to reflect new defaults. - Update Conda configuration option documentation to discuss copy_dependencies. - Cross link Conda and dependency resolver documentation as it makes sense. - Add a link to the Bioconda channel order documentation for future reference. - Make things a bit more concise in places - start with the implicit tl;dr. Commit: 088e246006ff750e9a78849c4dbca6bfcccbf84f https://github.com/galaxyproject/galaxy/commit/088e246006ff750e9a78849c4dbca... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-01-25 (Wed, 25 Jan 2017) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- fix two typos Commit: f3810f842fa1bb4d960262d1d91ccd5207738f30 https://github.com/galaxyproject/galaxy/commit/f3810f842fa1bb4d960262d1d91cc... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-01-25 (Wed, 25 Jan 2017) Changed paths: M doc/source/admin/dependency_resolvers.rst Log Message: ----------- minor adjustments Commit: f40489e66ea479f56e96f9ba62b1040294a04ba5 https://github.com/galaxyproject/galaxy/commit/f40489e66ea479f56e96f9ba62b10... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-01-25 (Wed, 25 Jan 2017) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- 2 more typos spotted by @mvdbeek Commit: 133dc79d3eef9ebab5558d28b840acb80395a034 https://github.com/galaxyproject/galaxy/commit/133dc79d3eef9ebab5558d28b840a... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-01-25 (Wed, 25 Jan 2017) Changed paths: M doc/source/admin/dependency_resolvers.rst Log Message: ----------- typo spotted by @mvdbeek Commit: 3eaad9a84ec6bda5f4dce190864b966b9d6287a5 https://github.com/galaxyproject/galaxy/commit/3eaad9a84ec6bda5f4dce190864b9... Author: Martin Cech <cech.marten@gmail.com> Date: 2017-01-25 (Wed, 25 Jan 2017) Changed paths: M doc/source/admin/conda_faq.rst M doc/source/admin/dependency_resolvers.rst Log Message: ----------- Merge pull request #3483 from jmchilton/doc_revision_0 [17.01] Dependency resolver documentation revisions. Compare: https://github.com/galaxyproject/galaxy/compare/71876f6de7d9...3eaad9a84ec6