summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ulimits: Updated docsulimit_supportJoffrey F2015-04-222-0/+3
* Improved ulimit testsJoffrey F2015-04-222-1/+26
* improved Ulimit classJoffrey F2015-04-221-7/+22
* assertRaises 2.6 compatJoffrey F2015-04-221-6/+3
* Add tests for ulimitsJoffrey F2015-04-221-4/+34
* Add support for ulimits in host_configJoffrey F2015-04-224-3/+57
* BaseTestCase shims assertInJoffrey F2015-04-222-2/+14
* Merge pull request #551 from docker/support_v2_private_registryJoffrey F2015-04-223-3/+7
|\
| * Modify expand_registry_url to support v2 private registries.support_v2_private_registryJoffrey F2015-04-223-3/+7
|/
* Merge branch 'ssssam-sam/import-improvements'Joffrey F2015-04-226-69/+330
|\
| * Merge branch 'sam/import-improvements' of https://github.com/ssssam/docker-py...Joffrey F2015-04-226-69/+330
| |\ |/ /
| * Add integration tests for Client.import_image() functionSam Thursfield2015-01-051-2/+160
| * docs: Add specific import_image() variantsSam Thursfield2015-01-051-0/+42
| * Rewrite Client.import_image() and add less-magical versionsSam Thursfield2015-01-052-27/+80
| * docs: Clarify import_image() docsSam Thursfield2015-01-051-7/+11
| * Rework Unix connection code so that 'chunked' transfers workSam Thursfield2015-01-054-31/+34
* | Merge branch 'hibooboo2-pull_auth'Joffrey F2015-04-222-10/+17
|\ \
| * | Small docs clarificationJoffrey F2015-04-221-0/+1
| * | Merge branch 'pull_auth' of https://github.com/hibooboo2/docker-py into hiboo...Joffrey F2015-04-222-10/+16
| |\ \ |/ / /
| * | Add auth config to pullJames Harris2015-02-182-10/+16
* | | Merge branch 'luzfcb-patch-1'Joffrey F2015-04-221-2/+5
|\ \ \
| * \ \ Merge branch 'patch-1' of https://github.com/luzfcb/docker-py into luzfcb-pat...Joffrey F2015-04-221-2/+5
| |\ \ \ |/ / / /
| * | | added URL for this project in setup configurationFábio C. Barrionuevo da Luz2015-03-311-0/+1
* | | | Merge branch 'terminalmage-version_info'Joffrey F2015-04-222-1/+2
|\ \ \ \
| * | | | Automatically generate version_info from version stringJoffrey F2015-04-221-1/+1
| * | | | Merge branch 'version_info' of https://github.com/terminalmage/docker-py into...Joffrey F2015-04-222-1/+2
| |\ \ \ \ |/ / / / /
| * | | | Add a version_info attributeErik Johnson2015-04-032-1/+2
| |/ / /
* | | | Merge pull request #530 from dlorenc/masterJoffrey F2015-04-222-2/+8
|\ \ \ \
| * | | | Add assert_fingerprint option.dlorenc2015-03-192-2/+8
* | | | | Merge pull request #537 from onorua/masterJoffrey F2015-04-222-3/+11
|\ \ \ \ \
| * | | | | IPC sharing implementationYaroslav Molochko2015-03-302-3/+11
| | |/ / / | |/| | |
* | | | | Merge pull request #544 from uvgroovy/masterJoffrey F2015-04-224-1/+186
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | removed unneeded importsYuval Kohavi2015-04-171-2/+0
| * | | | line lengthYuval Kohavi2015-04-111-3/+8
| * | | | python 2.6 compatibleYuval Kohavi2015-04-111-6/+3
| * | | | added ports to setup.pyYuval Kohavi2015-04-081-1/+1
| * | | | Adding port utils to split port rangesYuval Kohavi2015-04-033-0/+185
|/ / / /
* | | | Use assertRaises in a backward compatible fashionJoffrey F2015-03-251-2/+4
* | | | Added assertIn shim for py2.6Joffrey F2015-03-251-0/+5
* | | | Merge branch 'ewindisch-secopt'Joffrey F2015-03-254-4/+34
|\ \ \ \
| * | | | docs and unit test for security_optJoffrey F2015-03-252-0/+14
| * | | | Added some type and version checks; removed security_opt from container_confi...Joffrey F2015-03-252-5/+14
| * | | | Add security_opt for create/startEric Windisch2015-03-242-7/+14
|/ / / /
* | | | Merge pull request #533 from ynachiket/masterJoffrey F2015-03-211-1/+1
|\ \ \ \
| * | | | Fixed stats related typo in api.mdynachiket2015-03-211-1/+1
|/ / / /
* | | | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-03-205-8/+67
|\ \ \ \
| * \ \ \ Merge pull request #531 from josephpage/dockerignore-eof-windowsJoffrey F2015-03-201-1/+1
| |\ \ \ \
| | * | | | Windows : str.splitlines instead of str.splitJoseph Page2015-03-201-1/+1
| | |/ / /
| * | | | Merge pull request #532 from aanand/labelsJoffrey F2015-03-205-7/+66
| |\ \ \ \
| | * | | | Finish labels implementation, add tests and docsAanand Prasad2015-03-203-6/+54
View Lorry Controller Status