Changeset [0477c8a642a0c77cb5ce5e4b318468b699a60117] by Marcus Davy
Revision 0477c8a642a0c77cb5ce5e4b318468b699a60117,
committed by Marcus Davy
· October 29th, 2014 @ 01:22 PM
Merge branch 'moa.0.11' of github.com:mfiers/Moa into moa.0.11
Conflicts:
sphinx/intro.rst
https://github.com/mfiers/Moa/commit/0477c8a642a0c77cb5ce5e4b318468...
122 changed files
-
A
moa/api.py -
A
moa/plugin/job/parallelActor.py -
A
moa/plugin/job/pbsActor.py -
A
moa/plugin/system/doc/templates/localdir.page.jinja2 -
A
sphinx/intro2.rst -
A
sphinx/thanks.rst -
A
test/scripts/templates/map.sh -
A
test/scripts/templates/reduce.sh -
A
test/scripts/templates/simple.sh -
A
test/sub/.moa/config -
A
test/sub/.moa/template -
A
test/sub/.moa/template.d/simple.jinja2 -
A
test/sub/.moa/template.meta -
R
moa/data/etc/bash_completion.d/moa -
R
moa/plugin/system/doc/pelican_util.py -
R
moa/plugin/system/doc/theme/LICENSE.txt -
R
moa/plugin/system/doc/theme/NOTICE.txt -
R
moa/plugin/system/doc/theme/static/bootstrap.min.css -
R
moa/plugin/system/doc/theme/static/forkme_right_darkblue_121621.png -
R
moa/plugin/system/doc/theme/static/html5.js -
R
moa/plugin/system/doc/theme/static/images/icons/activestate.png -
R
moa/plugin/system/doc/theme/static/images/icons/bitbucket.png -
R
moa/plugin/system/doc/theme/static/images/icons/delicious.png -
R
moa/plugin/system/doc/theme/static/images/icons/favicon.ico -
R
moa/plugin/system/doc/theme/static/images/icons/folder_files.png -
R
moa/plugin/system/doc/theme/static/images/icons/github.png -
R
moa/plugin/system/doc/theme/static/images/icons/jamendo.png -
R
moa/plugin/system/doc/theme/static/images/icons/lastfm.png -
R
moa/plugin/system/doc/theme/static/images/icons/linkedin.png -
R
moa/plugin/system/doc/theme/static/images/icons/phosting.png -
R
moa/plugin/system/doc/theme/static/images/icons/reader.png -
R
moa/plugin/system/doc/theme/static/images/icons/rss.png -
R
moa/plugin/system/doc/theme/static/images/icons/stackoverflow.png -
R
moa/plugin/system/doc/theme/static/images/icons/twitter.png -
R
moa/plugin/system/doc/theme/static/images/icons/weibo.png -
R
moa/plugin/system/doc/theme/static/images/moa.logo.very.small.png -
R
moa/plugin/system/doc/theme/static/local.css -
R
moa/plugin/system/doc/theme/static/pygments.css -
R
moa/plugin/system/doc/theme/templates/analytics.html -
R
moa/plugin/system/doc/theme/templates/archives.html -
R
moa/plugin/system/doc/theme/templates/article.html -
R
moa/plugin/system/doc/theme/templates/author.html -
R
moa/plugin/system/doc/theme/templates/base.html -
R
moa/plugin/system/doc/theme/templates/categories.html -
R
moa/plugin/system/doc/theme/templates/category.html -
R
moa/plugin/system/doc/theme/templates/disqus.html -
R
moa/plugin/system/doc/theme/templates/facebook.html -
R
moa/plugin/system/doc/theme/templates/github.html -
R
moa/plugin/system/doc/theme/templates/index.html -
R
moa/plugin/system/doc/theme/templates/metadata.html -
R
moa/plugin/system/doc/theme/templates/page.html -
R
moa/plugin/system/doc/theme/templates/tag.html -
R
moa/plugin/system/doc/theme/templates/tags.html -
R
moa/plugin/system/doc/theme/templates/twitter.html -
M
".gitignore" -
M
Changelog.txt -
M
MANIFEST.in -
M
VERSION -
M
moa/args.py -
M
moa/backend/ruff/simple.py -
M
moa/cli/moainit.py -
M
moa/cli/moar.py -
M
moa/cli/setstatus.py -
M
moa/data/etc/config -
M
moa/data/etc/profile.d/moa.sh -
M
moa/data/jinja2/command.snippet.rst.jinja2 -
M
moa/data/templates/blast.jinja2 -
M
moa/data/templates/map.jinja2 -
M
moa/data/templates/map.moa -
M
moa/data/templates/reduce.jinja2 -
M
moa/data/templates/reduce.moa -
M
moa/data/templates/simple.jinja2 -
M
moa/data/templates/simple.moa -
M
moa/filesets.py -
M
moa/job.py -
M
moa/jobConf.py -
M
moa/logger.py -
M
moa/plugin/job/smw/__init__.py -
M
moa/plugin/system/adhoc.py -
M
moa/plugin/system/configure.py -
M
moa/plugin/system/doc/__init__.py -
M
moa/plugin/system/doc/templates/file.page.jinja2 -
M
moa/plugin/system/doc/templates/pelican.conf.jinja2 -
M
moa/plugin/system/doc/templates/redirect.jinja2 -
M
moa/plugin/system/fileset.py -
M
moa/plugin/system/help.py -
M
moa/plugin/system/mail.py -
M
moa/plugin/system/moaGit.py -
M
moa/plugin/system/moautil.py -
M
moa/plugin/system/newjob.py -
M
moa/plugin/system/parameterCheck.py -
M
moa/plugin/system/project.py -
M
moa/plugin/system/umask.py -
M
moa/sysConf.py -
M
moa/template/provider/gitmodule.py -
M
moa/template/template.py -
M
moa/ui.py -
M
moa/utils.py -
M
requirements.txt -
M
setup.py -
M
sphinx/commands/commands.header -
M
sphinx/commands/index.rst -
M
sphinx/commands/update_commands -
M
sphinx/contribute.rst -
M
sphinx/filesets.rst -
M
sphinx/git.rst -
M
sphinx/index.rst -
M
sphinx/install.rst -
M
sphinx/intro.rst -
M
sphinx/nature/staticlinks.html -
M
sphinx/templates/map.rst -
M
sphinx/templates/newjobtest.rst -
M
sphinx/templates/reduce.rst -
M
sphinx/templates/simple.rst -
M
test/scripts/commands/map.sh -
M
test/scripts/commands/moa.sh -
M
test/scripts/commands/new.sh -
M
test/scripts/commands/set.sh -
M
test/scripts/commands/show.sh -
M
test/scripts/commands/simple.sh -
M
test/scripts/commands/unset.sh -
M
test/scripts/configure/00.main.sh