Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 17c4af285d75e4a271880b37f4727df59987655a https://github.com/galaxyproject/galaxy/commit/17c4af285d75e4a271880b37f4727... Author: John Chilton jmchilton@gmail.com Date: 2016-10-04 (Tue, 04 Oct 2016)

Changed paths: M lib/galaxy/exceptions/__init__.py M lib/galaxy/exceptions/error_codes.py M lib/galaxy/jobs/metrics/__init__.py M lib/galaxy/jobs/metrics/collectl/__init__.py M lib/galaxy/jobs/metrics/collectl/cli.py M lib/galaxy/jobs/metrics/collectl/subsystems.py M lib/galaxy/jobs/metrics/formatting.py M lib/galaxy/jobs/metrics/instrumenters/__init__.py M lib/galaxy/jobs/metrics/instrumenters/collectl.py M lib/galaxy/jobs/metrics/instrumenters/core.py M lib/galaxy/jobs/metrics/instrumenters/cpuinfo.py M lib/galaxy/jobs/metrics/instrumenters/env.py M lib/galaxy/jobs/metrics/instrumenters/meminfo.py M lib/galaxy/jobs/metrics/instrumenters/uname.py

Log Message: ----------- Docstring fixes for galaxy.exceptions and galaxy.jobs.metrics.

xref https://github.com/galaxyproject/galaxy-lib/pull/21.

Rebase with spelling fixes thanks to @nsoranzo.

Commit: d9af95b401ebec1db5cd6653f5ebbb9a7fd5c3f5 https://github.com/galaxyproject/galaxy/commit/d9af95b401ebec1db5cd6653f5ebb... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2016-10-04 (Tue, 04 Oct 2016)

Changed paths: M lib/galaxy/exceptions/__init__.py M lib/galaxy/exceptions/error_codes.py M lib/galaxy/jobs/metrics/__init__.py M lib/galaxy/jobs/metrics/collectl/__init__.py M lib/galaxy/jobs/metrics/collectl/cli.py M lib/galaxy/jobs/metrics/collectl/subsystems.py M lib/galaxy/jobs/metrics/formatting.py M lib/galaxy/jobs/metrics/instrumenters/__init__.py M lib/galaxy/jobs/metrics/instrumenters/collectl.py M lib/galaxy/jobs/metrics/instrumenters/core.py M lib/galaxy/jobs/metrics/instrumenters/cpuinfo.py M lib/galaxy/jobs/metrics/instrumenters/env.py M lib/galaxy/jobs/metrics/instrumenters/meminfo.py M lib/galaxy/jobs/metrics/instrumenters/uname.py

Log Message: ----------- Merge pull request #3003 from jmchilton/docstrings1

Docstring fixes for galaxy.exceptions and galaxy.jobs.metrics.

Compare: https://github.com/galaxyproject/galaxy/compare/824f556ea7d0...d9af95b401eb