RedHatTraining/pyramid.git

Merge branch 'master' into feature/alchemy-scaffold-update

Michael Merickel

2016-01-31 3eb1c354d320536ee470b79dcb930d20da93d97d

refs
author	Michael Merickel <michael@merickel.org>
	Sunday, January 31, 2016 23:18 +0100
committer	Michael Merickel <michael@merickel.org>
	Sunday, January 31, 2016 23:18 +0100
commit	3eb1c354d320536ee470b79dcb930d20da93d97d
tree	18aa7fa0a4293919c1ed67ee7f8aae6372abcb06 tree \| zip \| gz
parent	67f733e161f19bb2b7322edd120b9bf489154536 view \| diff 9c01bf58c211bf9c28f8043459a5a0e9b25a5c35 view \| diff

Merge branch 'master' into feature/alchemy-scaffold-update

25 files deleted

7 files added

70 files modified

	.travis.yml	2 ●●●●● diff \| view \| raw \| blame \| history
	CHANGES.txt	12 ●●●●● diff \| view \| raw \| blame \| history
	CONTRIBUTORS.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	RELEASING.txt	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/conf.py	20 ●●●●● diff \| view \| raw \| blame \| history
	docs/designdefense.rst	548 ●●●●● diff \| view \| raw \| blame \| history
	docs/glossary.rst	38 ●●●●● diff \| view \| raw \| blame \| history
	docs/index.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/advconfig.rst	7 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/hooks.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/i18n.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/install.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/introduction.rst	7 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/project.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/subrequest.rst	14 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/upgrading.rst	21 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/webob.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour.rst	841 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/CHANGES.txt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/MANIFEST.in	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/README.txt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/__init__.py	23 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/locale/awesome.pot	21 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/locale/de/LC_MESSAGES/awesome.mo	diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/locale/de/LC_MESSAGES/awesome.po	21 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/locale/fr/LC_MESSAGES/awesome.mo	diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/locale/fr/LC_MESSAGES/awesome.po	21 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/models.py	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/static/favicon.ico	diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/static/logo.png	diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/static/pylons.css	73 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/templates/mytemplate.jinja2	87 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/tests.py	21 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/awesome/views.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/development.ini	49 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/message-extraction.ini	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/awesome/setup.py	36 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/hello_world/app.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/jinja2/app.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/jinja2/views.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/json/app.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/json/hello_world.jinja2	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/json/hello_world.pt	17 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/json/views.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/MANIFEST.in	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/development.ini	63 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/hello_world/__init__.py	14 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/hello_world/init.py	34 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/hello_world/models.py	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/hello_world/resources.py	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/hello_world/static/logo.png	diff \| view \| raw \| blame \| history
	docs/quick_tour/package/hello_world/static/pylons.css	73 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/hello_world/static/pyramid-16x16.png	diff \| view \| raw \| blame \| history
	docs/quick_tour/package/hello_world/static/pyramid.png	diff \| view \| raw \| blame \| history
	docs/quick_tour/package/hello_world/static/theme.css	153 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/hello_world/templates/mytemplate.jinja2	158 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/hello_world/views.py	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/setup.cfg	28 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/setup.py	27 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/requests/app.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/routing/app.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/routing/views.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sqla_demo/README.txt	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sqla_demo/setup.cfg	27 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/static_assets/app.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/static_assets/hello_world.jinja2	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/static_assets/hello_world.pt	16 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/static_assets/hello_world_static.jinja2	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/static_assets/views.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/templating/app.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/templating/views.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/view_classes/app.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/view_classes/hello.jinja2	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/view_classes/views.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/views/app.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/requirements.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/design.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/installation.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/installation.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.3.rst	11 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.6.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/compat.py	199 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/i18n.py	14 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/interfaces.py	4 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scripts/pserve.py	6 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/session.py	7 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/testing.py	3 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_adapters.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_factories.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_path.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_request.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scripts/test_pserve.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_session.py	7 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_traversal.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_urldispatch.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_util.py	30 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/traversal.py	42 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/urldispatch.py	12 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/util.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/view.py	2 ●●●●● diff \| view \| raw \| blame \| history
	setup.py	8 ●●●●● diff \| view \| raw \| blame \| history
	tox.ini	3 ●●●●● diff \| view \| raw \| blame \| history