Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8a48c802 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8a48c802 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8a48c802 Branch: refs/heads/develop Commit: 8a48c802e2faee02255108f34af3f7b6eb39665d Parents: 373f0c4 26e7c2a Author: Steve Loughran <ste...@apache.org> Authored: Wed Sep 17 22:02:49 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Sep 17 22:02:49 2014 +0100 ---------------------------------------------------------------------- .../main/python/jinja2/ext/Vim/htmljinja.vim | 27 - .../src/main/python/jinja2/ext/Vim/jinja.vim | 113 --- .../jinja2/ext/django2jinja/django2jinja.py | 768 ------------------- .../python/jinja2/ext/django2jinja/example.py | 7 - .../ext/django2jinja/templates/index.html | 58 -- .../ext/django2jinja/templates/layout.html | 4 - .../ext/django2jinja/templates/subtemplate.html | 1 - .../src/main/python/jinja2/ext/djangojinja2.py | 86 --- .../src/main/python/jinja2/ext/inlinegettext.py | 78 -- .../src/main/python/jinja2/ext/jinja.el | 213 ----- slider-assembly/pom.xml | 2 +- .../appmaster/model/mock/MockContainerId.groovy | 5 + 12 files changed, 6 insertions(+), 1356 deletions(-) ----------------------------------------------------------------------
