Commit Graph

7 Commits

Author SHA1 Message Date
shin- 0901b28957 Merge branch 'attach-websocket' of github.com:aanand/docker-py into aanand-attach-websocket
Conflicts:
	docker/client.py
2013-11-08 19:03:43 +01:00
shin- 0808905636 Refactoring, Python 3 compatibility, Tests working with python 3, cleaned up imports. 2013-10-15 19:19:20 +02:00
Aanand Prasad c2d867b117 Implement attach_websocket() for attaching with WebSockets instead of HTTP streaming 2013-10-03 14:44:33 +01:00
Deni Bertovic 320fcdeed9 added mock to requirements 2013-10-03 11:51:12 +02:00
Rob Terhaar d3edaa7a14 pip needs "==" 2013-07-13 19:42:13 -04:00
Mike Neilsen 5bf0625a7a Add six==1.3.0 to requirements.txt
Signed-off-by: Mike Neilsen <mneilsen@acm.org>
2013-07-13 01:04:39 -05:00
shin- f2bcd532d7 Added requirements file 2013-06-06 09:05:19 -07:00