summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Pull, push, and logs are always streamed. Pull and push is JSON-decoded on th...streams_onlyJoffrey F2014-08-222-134/+91
* Version back to x-devJoffrey F2014-08-221-1/+1
* Merge branch 'ifraixedes-patch-1'Joffrey F2014-08-221-1/+7
|\
| * Amended create_container documentationJoffrey F2014-08-221-1/+7
| |\ |/ /
| * Added comment for `command` argumentIvan Fraixedes2014-07-151-0/+2
* | Merge pull request #291 from yograterol/masterJoffrey F2014-08-222-2/+33
|\ \
| * | Change str type for six.string_types to py3 compatibilityYohan Graterol2014-08-201-2/+2
| * | Create test for volume as stringYohan Graterol2014-08-171-0/+25
| * | Remove unicode type in isinstanceYohan Graterol2014-08-171-2/+2
| * | Validation for volumes parameters as string in _container_configYohan Graterol2014-08-171-0/+3
| * | PEP8 compliance - space between numbers and operatorsYohan Graterol2014-08-171-2/+2
| * | Added validation for volumes parameter - Issue #276Yohan Graterol2014-08-171-0/+3
* | | Merge pull request #292 from mpetazzoni/stop-timeoutJoffrey F2014-08-202-7/+10
|\ \ \ | |/ / |/| |
| * | Stop timeout should be added to the request timeoutMaxime Petazzoni2014-08-192-7/+10
|/ /
* | Merge pull request #287 from leonidlm/feature/adding-memory-limit-string-supportJoffrey F2014-08-083-0/+101
|\ \
| * | Adding tests for mem_limit string conversion + adding default unitLeonid Mirsky2014-08-053-6/+80
| * | Fixing styling issuesLeonid Mirsky2014-08-051-6/+9
| * | Adding value verifications for mem_limit string representationLeonid Mirsky2014-08-051-6/+20
| * | Adding units specification to mem_limit variableLeonid Mirsky2014-08-052-0/+10
* | | Merge pull request #288 from dnephin/unpin_depsJoffrey F2014-08-081-7/+10
|\ \ \ | |/ / |/| |
| * | Resolves #101, don't use pinned dependencies.Daniel Nephin2014-08-081-7/+10
|/ /
* | Merge pull request #285 from silarsis/patch-1Joffrey F2014-07-311-1/+1
|\ \
| * | Added a timeout to the https pingKevin Littlejohn2014-07-311-1/+1
|/ /
* | Merge pull request #283 from bfirsh/fix-travis-badgeJoffrey F2014-07-291-1/+1
|\ \
| * | Fix travis badge URLBen Firshman2014-07-281-1/+1
|/ /
* | Merge pull request #280 from emonty/remove_auth_from_testsJoffrey F2014-07-231-2/+10
|\ \
| * | Protect push tests from environmentMonty Taylor2014-07-221-2/+10
| |/
* | Merge pull request #268 from brutasse/265-dockerignoreJoffrey F2014-07-234-4/+120
|\ \
| * | Add support for .dockerignoreBruno ReniƩ2014-07-234-4/+121
* | | Merge pull request #279 from dotcloud/0.4.0-release0.4.0Joffrey F2014-07-222-1/+20
|\ \ \
| * | | Updated ChangeLog and bumped versionJoffrey F2014-07-222-1/+20
|/ / /
* | | Merge pull request #278 from samos123/masterJoffrey F2014-07-221-0/+3
|\ \ \
| * | | Add documentation format of environment variableSam Stoelinga2014-07-221-0/+3
|/ / /
* | | Merge pull request #269 from Aigeruth/feature/coverageJoffrey F2014-07-214-4/+21
|\ \ \ | |_|/ |/| |
| * | Add coverageGabor Nagy2014-07-114-4/+21
|/ /
* | Merge pull request #250 from dotcloud/momer-tlsJoffrey F2014-07-107-3/+188
|\ \
| * \ Merge branch 'master' into momer-tlsJoffrey F2014-07-1010-28/+165
| |\ \ | |/ / |/| |
* | | Merge pull request #259 from dotcloud/166-complete-parse-hostJoffrey F2014-07-095-16/+109
|\ \ \
| * | | Support http+unix protocolJoffrey F2014-07-031-0/+2
| * | | Fixed base_url related testsJoffrey F2014-07-031-4/+4
| * | | Implemented complete parse_host method to handle all accepted values of Clien...Joffrey F2014-07-034-12/+103
| | |/ | |/|
* | | Merge pull request #261 from mmerickel/fix.remote-testingJoffrey F2014-07-091-5/+15
|\ \ \ | |/ / |/| |
| * | allow docker client to connect to a remote hostMichael Merickel2014-07-071-2/+4
| * | support specifying location of temp foldersMichael Merickel2014-07-051-1/+9
| * | fix ListContainers which was failing with "executable true; not found"Michael Merickel2014-07-051-2/+2
|/ /
* | Python 3 sees empty lines as \n instead of \r\n (wat). Fixes #257Joffrey F2014-07-031-1/+1
* | Back to -dev versionJoffrey F2014-06-231-1/+1
* | Merge pull request #245 from dotcloud/0.3.2-release0.3.2Joffrey F2014-06-234-3/+38
|\ \
| * | Updated changelog with last minute changes ; updated default API version in R...0.3.2-releaseJoffrey F2014-06-232-1/+3
| * | Added support for Python 3.4 in setup.py classifiersJoffrey F2014-06-231-0/+1