Commit Graph

56 Commits

Author SHA1 Message Date
Joffrey F 37c8072f60 Merge branch 'pause-unpause' of github.com:phensley/docker-py into phensley-pause-unpause
Conflicts:
	README.md
	tests/integration_test.py
	tests/test.py
2014-10-29 19:35:05 +01:00
Joffrey F e0d6b267ee Merge branch 'exec' of github.com:phensley/docker-py into phensley-exec
Conflicts:
	README.md
2014-10-29 17:19:27 +01:00
micahhausler 47baf2218f Added .version() 2014-10-27 15:13:26 -04:00
micahhausler 0e6b96a70f Added .wait() 2014-10-27 15:06:28 -04:00
micahhausler 7d0f190d0b Capitalize Docker 2014-10-27 14:56:43 -04:00
micahhausler 199023c576 Added markdown docs 2014-10-24 16:55:22 -04:00