Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Back to dev version | Joffrey F | 2014-11-03 | 1 | -1/+1 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #386 from docker/0.6.0-release0.6.0 | Joffrey F | 2014-11-03 | 4 | -5/+47 | |
|\ \ \ | ||||||
| * | | | Fixed ChangeLog section titles0.6.0-release | Joffrey F | 2014-11-03 | 1 | -2/+2 | |
| * | | | Fixed integration test | Joffrey F | 2014-11-03 | 1 | -0/+2 | |
| * | | | exec -> execute | Joffrey F | 2014-11-03 | 2 | -3/+3 | |
| * | | | Merge branch 'master' into 0.6.0-release | Joffrey F | 2014-11-03 | 2 | -3/+5 | |
| |\ \ \ | |/ / / |/| | | | ||||||
* | | | | Merge branch 'master' of github.com:dotcloud/docker-py | Joffrey F | 2014-11-03 | 1 | -0/+2 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #333 from alexliew/change_remove_image | Joffrey F | 2014-11-03 | 1 | -0/+2 | |
| |\ \ \ \ | ||||||
| | * | | | | Remove trailing whitespace. | Alex | 2014-10-04 | 1 | -1/+1 | |
| | * | | | | Change remove_image to check if image is a dictionary and use Id value if it is. | Alex | 2014-10-01 | 1 | -0/+2 | |
* | | | | | | Changed assertIn to assertTrue(... in ...) (2.6 support) | Joffrey F | 2014-11-03 | 1 | -3/+3 | |
|/ / / / / | ||||||
| | * | | | Updated ChangeLog | Joffrey F | 2014-11-03 | 1 | -2/+42 | |
| | * | | | Bumped version | Joffrey F | 2014-11-03 | 1 | -1/+1 | |
| |/ / / |/| | | | ||||||
* | | | | Merge branch 'irachex-filters' | Joffrey F | 2014-11-03 | 6 | -9/+57 | |
|\ \ \ \ | ||||||
| * | | | | Updated tox.ini to also run utils_test.py tests | Joffrey F | 2014-11-03 | 1 | -0/+3 | |
| * | | | | Merge branch 'filters' of github.com:irachex/docker-py into irachex-filters | Joffrey F | 2014-11-03 | 5 | -9/+54 | |
| |\ \ \ \ |/ / / / / | ||||||
| * | | | | Add support for filtering images and containers | Huayi Zhang | 2014-10-05 | 5 | -4/+50 | |
| |/ / / | ||||||
* | | | | Merge pull request #319 from psftw/bugfix_history | Joffrey F | 2014-10-30 | 1 | -2/+1 | |
|\ \ \ \ | ||||||
| * | | | | Make history() return json. | Peter Salvatore | 2014-09-10 | 1 | -2/+1 | |
| |/ / / | ||||||
* | | | | Merge branch 'totem-feature_logs-tail' | Joffrey F | 2014-10-30 | 3 | -4/+36 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'feature_logs-tail' of github.com:totem/docker-py into totem-fea... | Joffrey F | 2014-10-30 | 3 | -4/+36 | |
| |\ \ \ \ |/ / / / / | ||||||
| * | | | | Add support for tailing logs (introduced in API : v1.13) | sukrit007 | 2014-08-22 | 4 | -3/+36 | |
* | | | | | Merge pull request #379 from tutumcloud/logs_tail | Joffrey F | 2014-10-30 | 2 | -5/+11 | |
|\ \ \ \ \ | ||||||
| * | | | | | Added tail behaviour to logs command, same as CLI v1.3 (latest) | Alberto | 2014-10-27 | 2 | -5/+11 | |
* | | | | | | Merge pull request #381 from micahhausler/py3socket | Joffrey F | 2014-10-30 | 3 | -1/+25 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Reverted Dockerfile | micahhausler | 2014-10-30 | 1 | -17/+5 | |
| * | | | | | | Added test requirements to install | micahhausler | 2014-10-29 | 1 | -1/+3 | |
| * | | | | | | Fixed conflict | micahhausler | 2014-10-29 | 25 | -447/+1394 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Fixed socket for py3 | micahhausler | 2014-10-28 | 3 | -6/+36 | |
* | | | | | | | | Merge pull request #385 from fbacchella/master | Joffrey F | 2014-10-30 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | White space cleaned | Fabrice Bacchella | 2014-10-30 | 1 | -1/+1 | |
| * | | | | | | | | When docker is stopped, docker-py receive a empty string in socket.readline() | Fabrice Bacchella | 2014-10-30 | 1 | -1/+5 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'master' of github.com:dotcloud/docker-py | Joffrey F | 2014-10-30 | 11 | -5/+107 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Added hosted docs info to README | Joffrey F | 2014-10-30 | 1 | -1/+4 | |
| * | | | | | | | | Merge pull request #324 from infoxchange/clear-unixconn-pool | Joffrey F | 2014-10-30 | 3 | -1/+47 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | Test resource warnings when using the client | Alexey Kotlyarov | 2014-09-22 | 2 | -0/+26 | |
| | * | | | | | | | Clear the UNIX connection sockets properly | Alexey Kotlyarov | 2014-09-22 | 1 | -1/+21 | |
| | | |_|_|/ / / | | |/| | | | | | ||||||
| * | | | | | | | Merge pull request #326 from tomprince/patch-1 | Joffrey F | 2014-10-29 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Add tests to sdist. | Tom Prince | 2014-09-23 | 1 | -1/+2 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #328 from alunduil/master | Joffrey F | 2014-10-29 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Add tests to sdist. | Alex Brandt | 2014-09-26 | 1 | -1/+2 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #360 from proppy/kwargs-from-env | Joffrey F | 2014-10-29 | 6 | -2/+54 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | utils: add kwargs_from_env | Johan Euphrosine | 2014-10-29 | 6 | -2/+54 | |
* | | | | | | | | | Merge branch 'ewindisch-angry-poodle' | Joffrey F | 2014-10-30 | 2 | -2/+16 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix typo | Joffrey F | 2014-10-30 | 1 | -1/+1 | |
| * | | | | | | | | Merge branch 'angry-poodle' of github.com:ewindisch/docker-py into ewindisch-... | Joffrey F | 2014-10-30 | 2 | -2/+16 | |
| |\ \ \ \ \ \ \ \ |/ / / / / / / / / | ||||||
| * | | | | | | | | Require highest level of client-supported SSL/TLS crypto | Eric Windisch | 2014-10-29 | 2 | -2/+16 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'phensley-pause-unpause' | Joffrey F | 2014-10-29 | 6 | -0/+95 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'pause-unpause' of github.com:phensley/docker-py into phensley-p... | Joffrey F | 2014-10-29 | 6 | -0/+95 | |
| |\ \ \ \ \ \ \ \ |/ / / / / / / / / | ||||||
| * | | | | | | | | Unit and integration tests for pause/unpause. | Patrick Hensley | 2014-10-04 | 3 | -0/+67 |