summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove unused filesremove-ci-transition-filesJoffrey F2015-11-122-17/+0
* Merge pull request #796 from v-boyko/feature/logs_sinceDaniel Nephin2015-11-124-2/+50
|\
| * Merge upstream branch 'master' into feature/logs_sinceViacheslav Boiko2015-11-0549-3365/+4239
| |\
| * | Support the 'since' option in the 'containers/<id>/logs' endpointViacheslav Boiko2015-10-024-2/+49
* | | Merge pull request #848 from docker/845-fixJoffrey F2015-11-122-19/+32
|\ \ \
| * | | Client.logs(tail=0) now shows no past logs (expected behavior)Joffrey F2015-11-122-19/+32
* | | | Add build integration test checking stderr shows up in streamJoffrey F2015-11-112-0/+21
* | | | Merge pull request #846 from docker/838-updateJoffrey F2015-11-112-1/+28
|\ \ \ \ | |/ / /
| * | | Update buildargs test to avoid race condition838-updateJoffrey F2015-11-101-2/+5
| * | | Support 'buildargs' parameter for docker 1.9.Leonty2015-11-102-1/+25
|/ / /
* | | Merge pull request #839 from docker/bump_api_version_121Aanand Prasad2015-11-053-17/+20
|\ \ \ | |_|/ |/| |
| * | Bump default API version to 1.21bump_api_version_121Joffrey F2015-11-043-17/+20
|/ /
* | Merge pull request #830 from docker/fix-links-create-testJoffrey F2015-10-281-1/+1
|\ \
| * | Use network_mode=bridge when testing linksJoffrey F2015-10-281-1/+1
* | | Merge pull request #827 from coreypobrien/lessbindingJoffrey F2015-10-281-45/+53
|\ \ \ | |/ / |/| |
| * | Move container volume bind tests to their own classCorey O'Brien2015-10-271-45/+53
* | | Fix py3.2 test failure and unicode behaviorJoffrey F2015-10-272-6/+10
|/ /
* | Merge pull request #825 from aebm/masterJoffrey F2015-10-272-1/+30
|\ \
| * | Fix auth.load_config bug calling parse_authAlejandro Brito Monedero2015-10-272-1/+30
* | | Merge pull request #824 from dnephin/fix_unicode_commandsJoffrey F2015-10-274-7/+24
|\ \ \ | |/ / |/| |
| * | Support unicode commands.Daniel Nephin2015-10-264-7/+24
|/ /
* | Merge pull request #809 from docker/reorganize_testsJoffrey F2015-10-2128-3713/+3731
|\ \
| * | Reorganize test directoriesreorganize_testsJoffrey F2015-10-2128-3713/+3731
|/ /
* | Merge pull request #820 from docker/819-volumes-createJoffrey F2015-10-213-4/+4
|\ \
| * | Update `Client.create_volume` to use new endpoint819-volumes-createJoffrey F2015-10-213-4/+4
|/ /
* | Merge pull request #812 from docker/811-unix-adapterJoffrey F2015-10-211-3/+11
|\ \
| * | Fix Unix adapter bug with newer versions of requests811-unix-adapterJoffrey F2015-10-191-3/+11
|/ /
* | Back to dev versionJoffrey F2015-10-191-1/+1
* | Merge pull request #808 from alasdairnicol/docs_examplesDaniel Nephin2015-10-156-26/+26
|\ \
| * | Tidied up code examples in docsAlasdair Nicol2015-10-146-26/+26
* | | Pull correct version of busybox in integration testsJoffrey F2015-10-141-1/+1
* | | Merge branch 'delfick-patch-1'Joffrey F2015-10-145-12/+123
|\ \ \ | |/ / |/| |
| * | Fix attach method over SSL connectionsStephen Moore2015-10-145-12/+123
| * | Use DOCKER_CONFIG environment variable to look up auth configJoffrey F2015-10-142-57/+84
| * | Add devices param to the hostconfig documentationJoffrey F2015-10-141-0/+8
| * | Update changelog and bump version to 1.5.0Joffrey F2015-10-142-1/+38
| * | Use url-safe base64 when encoding auth headerJoffrey F2015-10-142-4/+15
| * | put/get archive implementationJoffrey F2015-10-148-2/+198
| * | Docs: Remove float from valid cpu_shares typesJoffrey F2015-10-141-1/+1
| * | Fix testsJoffrey F2015-10-142-9/+13
| * | Add minimum_version decorators on NetworkApi methodsJoffrey F2015-10-141-1/+7
| * | Implement methods for managing networksAanand Prasad2015-10-145-1/+290
| * | Don't break when volume binds contain unicode charactersJoffrey F2015-10-142-6/+104
* | | Merge pull request #802 from docker/785-docker_config_envJoffrey F2015-10-132-57/+84
|\ \ \
| * | | Use DOCKER_CONFIG environment variable to look up auth config785-docker_config_envJoffrey F2015-10-092-57/+84
* | | | Merge pull request #801 from docker/1.5.0-release1.5.0Joffrey F2015-10-123-1/+46
|\ \ \ \
| * | | | Add devices param to the hostconfig documentation1.5.0-releaseJoffrey F2015-10-081-0/+8
| * | | | Update changelog and bump version to 1.5.0Joffrey F2015-10-082-1/+38
| |/ / /
* | | | Merge pull request #806 from docker/803-urlsafe-b64Joffrey F2015-10-092-4/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Use url-safe base64 when encoding auth header803-urlsafe-b64Joffrey F2015-10-092-4/+15
|/ / /