summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | Update auth.resolve_repository_nameJoffrey F2015-11-234-41/+55
| |/
* | Merge pull request #841 from delfick/proxy_pool_manager_assert_hostnameJoffrey F2015-11-241-0/+13
|\ \ | |/ |/|
| * Ensure assert_hostname is set on the pool connectionStephen Moore2015-11-081-0/+13
* | Merge pull request #855 from docker/852-independent-integrationJoffrey F2015-11-1811-181/+182
|\ \
| * | Fix integration-dind-ssl make task852-independent-integrationJoffrey F2015-11-182-3/+3
| * | Move methods/classes used by all integration tests to helpers.pyJoffrey F2015-11-1810-178/+179
|/ /
* | Merge branch 'schu-oom-kill-disable-pr'Joffrey F2015-11-184-12/+27
|\ \
| * | Wrong key name in stats testJoffrey F2015-11-181-1/+1
| * | Merge branch 'oom-kill-disable-pr' of https://github.com/schu/docker-py into ...Joffrey F2015-11-183-11/+26
| |\ \ |/ / /
| * | create_host_config: allow setting oom_kill_disableMichael Schubert2015-11-103-2/+17
| |/
* | Merge pull request #832 from aebm/masterJoffrey F2015-11-182-1/+31
|\ \
| * | Fix #627Alejandro Brito Monedero2015-10-292-1/+31
* | | Merge pull request #805 from sourcelair/enhancement/stats-no-streamDaniel Nephin2015-11-174-2/+51
|\ \ \
| * | | Add EditorConfig to the repo.Antonis Kalipetis2015-10-221-0/+11
| * | | Add test for streaming statsAntonis Kalipetis2015-10-221-2/+16
| * | | Add integration test for stats no-streamAntonis Kalipetis2015-10-221-0/+17
| * | | Enhance docs for stats methodAntonis Kalipetis2015-10-221-0/+2
| * | | Add suport for non-stream stats of containersAntonis Kalipetis2015-10-221-2/+7
* | | | Merge pull request #834 from lots0logs/814-host-config-mem-swapDaniel Nephin2015-11-163-19/+68
|\ \ \ \
| * | | | Update hostconfig.mdDustin Falgout2015-11-091-1/+1
| * | | | Dont include mem_swappiness when testing use of str valuesDustin Falgout2015-11-051-2/+1
| * | | | Incorporates feedback from and closes #814Dustin Falgout2015-11-053-19/+69
| | |/ / | |/| |
* | | | Merge pull request #851 from docker/remove-ci-transition-filesJoffrey F2015-11-122-17/+0
|\ \ \ \
| * | | | Remove unused filesremove-ci-transition-filesJoffrey F2015-11-122-17/+0
* | | | | Merge pull request #850 from docker/mnowster-test-no-log-driver-specifiedJoffrey F2015-11-121-2/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'test-no-log-driver-specified' of https://github.com/mnowster/do...mnowster-test-no-log-driver-specifiedJoffrey F2015-11-121-2/+0
| |\ \ \ \
| | * | | | Remove skip testMazz Mosley2015-10-011-2/+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
|\ \