Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tornadoweb/tornado
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: rbu/tornado
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 4, 2011

  1. Allow timedelta specifications in add_timeout

    @rbu
    rbu committed Aug 4, 2011
    Configuration menu
    Copy the full SHA
    1f8a4e0 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2011

  1. merge branch2.1

    @rbu
    rbu committed Oct 12, 2011
    Configuration menu
    Copy the full SHA
    7eae321 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2011

  1. JSON encode/decode: Allow keyword attributes for dumps/loads 

    Python's json module and simplejson allow some keyword arguments to be
set (e.g., indentation, or default encoding handlers). Extending
the compatibility wrappers for these arguments to be passed on.
    @rbu
    rbu committed Dec 6, 2011
    Configuration menu
    Copy the full SHA
    ba54ffc View commit details
    Browse the repository at this point in the history

  2. JSON encode/decode: Allow keyword attributes for dumps/loads 

    Python's json module and simplejson allow some keyword arguments to be
set (e.g., indentation, or default encoding handlers). Extending
the compatibility wrappers for these arguments to be passed on.
    @rbu
    rbu committed Dec 6, 2011
    Configuration menu
    Copy the full SHA
    431c29e View commit details
    Browse the repository at this point in the history

  3. Merge branch '2.1-allow-json-keyword-arguments'

    @rbu
    rbu committed Dec 6, 2011
    Configuration menu
    Copy the full SHA
    1ccfeb4 View commit details
    Browse the repository at this point in the history
Loading