summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed ChangeLog section titles0.6.0-releaseJoffrey F2014-11-031-2/+2
* Fixed integration testJoffrey F2014-11-031-0/+2
* exec -> executeJoffrey F2014-11-032-3/+3
* Merge branch 'master' into 0.6.0-releaseJoffrey F2014-11-032-3/+5
|\
| * Merge branch 'master' of github.com:dotcloud/docker-pyJoffrey F2014-11-031-0/+2
| |\
| | * Merge pull request #333 from alexliew/change_remove_imageJoffrey F2014-11-031-0/+2
| | |\
| | | * Remove trailing whitespace.Alex2014-10-041-1/+1
| | | * Change remove_image to check if image is a dictionary and use Id value if it is.Alex2014-10-011-0/+2
| * | | Changed assertIn to assertTrue(... in ...) (2.6 support)Joffrey F2014-11-031-3/+3
| |/ /
* | | Updated ChangeLogJoffrey F2014-11-031-2/+42
* | | Bumped versionJoffrey F2014-11-031-1/+1
|/ /
* | Merge branch 'irachex-filters'Joffrey F2014-11-036-9/+57
|\ \
| * | Updated tox.ini to also run utils_test.py testsJoffrey F2014-11-031-0/+3
| * | Merge branch 'filters' of github.com:irachex/docker-py into irachex-filtersJoffrey F2014-11-035-9/+54
| |\ \ |/ / /
| * | Add support for filtering images and containersHuayi Zhang2014-10-055-4/+50
| |/
* | Merge pull request #319 from psftw/bugfix_historyJoffrey F2014-10-301-2/+1
|\ \
| * | Make history() return json.Peter Salvatore2014-09-101-2/+1
| |/
* | Merge branch 'totem-feature_logs-tail'Joffrey F2014-10-303-4/+36
|\ \
| * \ Merge branch 'feature_logs-tail' of github.com:totem/docker-py into totem-fea...Joffrey F2014-10-303-4/+36
| |\ \ |/ / /
| * | Add support for tailing logs (introduced in API : v1.13)sukrit0072014-08-224-3/+36
* | | Merge pull request #379 from tutumcloud/logs_tailJoffrey F2014-10-302-5/+11
|\ \ \
| * | | Added tail behaviour to logs command, same as CLI v1.3 (latest)Alberto2014-10-272-5/+11
* | | | Merge pull request #381 from micahhausler/py3socketJoffrey F2014-10-303-1/+25
|\ \ \ \
| * | | | Reverted Dockerfilemicahhausler2014-10-301-17/+5
| * | | | Added test requirements to installmicahhausler2014-10-291-1/+3
| * | | | Fixed conflictmicahhausler2014-10-2925-447/+1394
| |\ \ \ \
| * | | | | Fixed socket for py3micahhausler2014-10-283-6/+36
* | | | | | Merge pull request #385 from fbacchella/masterJoffrey F2014-10-301-1/+5
|\ \ \ \ \ \
| * | | | | | White space cleanedFabrice Bacchella2014-10-301-1/+1
| * | | | | | When docker is stopped, docker-py receive a empty string in socket.readline()Fabrice Bacchella2014-10-301-1/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' of github.com:dotcloud/docker-pyJoffrey F2014-10-3011-5/+107
|\ \ \ \ \ \
| * | | | | | Added hosted docs info to READMEJoffrey F2014-10-301-1/+4
| * | | | | | Merge pull request #324 from infoxchange/clear-unixconn-poolJoffrey F2014-10-303-1/+47
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Test resource warnings when using the clientAlexey Kotlyarov2014-09-222-0/+26
| | * | | | | Clear the UNIX connection sockets properlyAlexey Kotlyarov2014-09-221-1/+21
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #326 from tomprince/patch-1Joffrey F2014-10-290-0/+0
| |\ \ \ \ \
| | * | | | | Add tests to sdist.Tom Prince2014-09-231-1/+2
| | |/ / / /
| * | | | | Merge pull request #328 from alunduil/masterJoffrey F2014-10-291-1/+2
| |\ \ \ \ \
| | * | | | | Add tests to sdist.Alex Brandt2014-09-261-1/+2
| | |/ / / /
| * | | | | Merge pull request #360 from proppy/kwargs-from-envJoffrey F2014-10-296-2/+54
| |\ \ \ \ \
| | * | | | | utils: add kwargs_from_envJohan Euphrosine2014-10-296-2/+54
* | | | | | | Merge branch 'ewindisch-angry-poodle'Joffrey F2014-10-302-2/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix typoJoffrey F2014-10-301-1/+1
| * | | | | | Merge branch 'angry-poodle' of github.com:ewindisch/docker-py into ewindisch-...Joffrey F2014-10-302-2/+16
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Require highest level of client-supported SSL/TLS cryptoEric Windisch2014-10-292-2/+16
| |/ / / / /
* | | | | | Merge branch 'phensley-pause-unpause'Joffrey F2014-10-296-0/+95
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'pause-unpause' of github.com:phensley/docker-py into phensley-p...Joffrey F2014-10-296-0/+95
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Unit and integration tests for pause/unpause.Patrick Hensley2014-10-043-0/+67
| * | | | | | Added pause/unpause methods.Patrick Hensley2014-10-042-0/+26
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #354 from bfirsh/use-official-repository-for-dockerfileJoffrey F2014-10-292-4/+19
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |