git.ipfire.org Git - thirdparty/tornado.git/commit

]> git.ipfire.org Git - thirdparty/tornado.git/commit

projects / thirdparty / tornado.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d007a2f 5a1497d)

author	Ben Darnell <ben@bendarnell.com>
	Sun, 27 Apr 2014 00:32:10 +0000 (20:32 -0400)
committer	Ben Darnell <ben@bendarnell.com>
	Sun, 27 Apr 2014 00:32:10 +0000 (20:32 -0400)
commit	500a6055342c0765efa8d6fa12c0046ab48bca59
tree	4ae2f030c13da08f38fa31696c796265307c5c5c	tree
parent	d007a2f9ae0eae6e4259a30934218226dfa92134	commit \| diff
parent	5a1497dfaf8e4252972a41e9e22d077423675437	commit \| diff

Merge branch 'master' into http_refactor

Conflicts:
tornado/iostream.py

12 files changed:

docs/releases/v3.2.0.rst	diff1 \|	diff2 \|	blob \| history
tornado/concurrent.py	diff1 \|	diff2 \|	blob \| history
tornado/httpclient.py	diff1 \|	diff2 \|	blob \| history
tornado/ioloop.py	diff1 \|	diff2 \|	blob \| history
tornado/iostream.py	diff1 \|	diff2 \|	blob \| history
tornado/simple_httpclient.py	diff1 \|	diff2 \|	blob \| history
tornado/tcpserver.py	diff1 \|	diff2 \|	blob \| history
tornado/test/netutil_test.py	diff1 \|	diff2 \|	blob \| history
tornado/test/util.py	diff1 \|	diff2 \|	blob \| history
tornado/testing.py	diff1 \|	diff2 \|	blob \| history
tornado/util.py	diff1 \|	diff2 \|	blob \| history
tornado/web.py	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/tornadoweb/tornado.git