merge changes from next-stable branch
Showing
- .hgignore 6 additions, 0 deletions.hgignore
- .hgtags 1 addition, 0 deletions.hgtags
- LICENSE.txt 181 additions, 20 deletionsLICENSE.txt
- community_wsgi.ini.sample 1 addition, 1 deletioncommunity_wsgi.ini.sample
- doc/source/lib/galaxy.jobs.runners.rst 1 addition, 0 deletionsdoc/source/lib/galaxy.jobs.runners.rst
- doc/source/lib/galaxy.util.rst 1 addition, 0 deletionsdoc/source/lib/galaxy.util.rst
- doc/source/lib/galaxy.webapps.community.controllers.rst 0 additions, 8 deletionsdoc/source/lib/galaxy.webapps.community.controllers.rst
- doc/source/lib/galaxy.webapps.community.util.rst 8 additions, 0 deletionsdoc/source/lib/galaxy.webapps.community.util.rst
- doc/source/lib/galaxy.webapps.galaxy.api.rst 0 additions, 4 deletionsdoc/source/lib/galaxy.webapps.galaxy.api.rst
- eggs.ini 2 additions, 0 deletionseggs.ini
- lib/galaxy/app.py 11 additions, 1 deletionlib/galaxy/app.py
- lib/galaxy/config.py 5 additions, 1 deletionlib/galaxy/config.py
- lib/galaxy/datatypes/converters/interval_to_fli.py 5 additions, 0 deletionslib/galaxy/datatypes/converters/interval_to_fli.py
- lib/galaxy/datatypes/tabular.py 1 addition, 1 deletionlib/galaxy/datatypes/tabular.py
- lib/galaxy/datatypes/util/gff_util.py 13 additions, 2 deletionslib/galaxy/datatypes/util/gff_util.py
- lib/galaxy/jobs/__init__.py 29 additions, 0 deletionslib/galaxy/jobs/__init__.py
- lib/galaxy/jobs/handler.py 2 additions, 2 deletionslib/galaxy/jobs/handler.py
- lib/galaxy/jobs/runners/__init__.py 199 additions, 30 deletionslib/galaxy/jobs/runners/__init__.py
- lib/galaxy/jobs/runners/drmaa.py 7 additions, 5 deletionslib/galaxy/jobs/runners/drmaa.py
- lib/galaxy/jobs/runners/lwr.py 142 additions, 290 deletionslib/galaxy/jobs/runners/lwr.py
Please register or sign in to comment