##// END OF EJS Templates
Merge commit '37dadeb' (most of PR #4391)...
Merge commit '37dadeb' (most of PR #4391) Conflicts: IPython/testing/iptestcontroller.py
Thomas Kluyver -
r13312:c1912cf4 merge
Show More
Name Size Modified Last Commit Author
/ IPython / parallel / controller
__init__.py Loading ...
dependency.py Loading ...
dictdb.py Loading ...
heartmonitor.py Loading ...
hub.py Loading ...
mongodb.py Loading ...
scheduler.py Loading ...
sqlitedb.py Loading ...