]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
projects / thirdparty / tornado.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fde872d 92d1eb0)
Merge pull request #484 from vadimg/master
authorbdarnell <ben@bendarnell.com>
Mon, 7 May 2012 04:36:39 +0000 (21:36 -0700)
committerbdarnell <ben@bendarnell.com>
Mon, 7 May 2012 04:36:39 +0000 (21:36 -0700)
make commandline args override config file args when multiple=True

1  2 
tornado/options.py patch | diff1 | diff2 | blob | history

diff --cc tornado/options.py
Simple merge
Mirror of https://github.com/tornadoweb/tornado.git