summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #470 from docker/0.7.2-release0.7.2Joffrey F2015-02-012-1/+25
|\
| * Bumped version0.7.2-releaseJoffrey F2015-02-011-1/+1
| * Updated changelogJoffrey F2015-02-011-0/+24
|/
* Fix #458Joffrey F2015-02-011-1/+1
* Fix #466Joffrey F2015-02-012-4/+10
* Bumped version back to devJoffrey F2015-02-011-1/+1
* Additional tests and small improvement to auth.resolve_authconfigJoffrey F2015-02-013-3/+58
* Merge pull request #441 from dims/fix-log-streamsJoffrey F2015-02-011-28/+14
|\
| * Fix to enable streaming container logs reliablyDavanum Srinivas2015-01-191-28/+14
* | Merge pull request #464 from hibooboo2/add_support_for_mac_addressJoffrey F2015-02-015-5/+38
|\ \
| * | Add Support for Mac AddressJames Harris2015-01-215-5/+38
| |/
* | Merge pull request #468 from wellbehavedsoftware/fix-auth-urlsMaxime Petazzoni2015-01-291-1/+1
|\ \ | |/ |/|
| * fix registry url canonicalization in resolve_authconfigJames Pharaoh2015-01-291-1/+1
|/
* Merge pull request #462 from tutumcloud/fix_create_host_configJoffrey F2015-01-161-5/+5
|\
| * fix create_host_config methodbernardopericacho2015-01-161-5/+5
|/
* Fixed TestRestartingContainer0.7.1Joffrey F2015-01-131-2/+2
* Merge pull request #460 from docker/0.7.1-releaseJoffrey F2015-01-123-3/+21
|\
| * Updated version and changelog0.7.1-releaseJoffrey F2015-01-122-1/+18
| * Added deprecation warning for stream parameter in Client.build()Joffrey F2015-01-121-2/+3
|/
* Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-01-121-1/+2
|\
| * Merge pull request #456 from naxhh/patch-1Maxime Petazzoni2015-01-111-1/+2
| |\
| | * Fix closing code tag in TLS doc.Ignacio Tolstoy2015-01-111-1/+2
| |/
* | Expanded on boot2docker SSL error resolutionJoffrey F2015-01-121-2/+6
* | Merge branch 'boot2docker-docs' of https://github.com/ziadsawalha/docker-py i...Joffrey F2015-01-121-0/+14
|\ \ | |/ |/|
| * Update boot2docker docs with tls workaroundZiad Sawalha2014-12-201-0/+14
* | urllib3/requests issuesJoffrey F2015-01-093-9/+9
* | Integration tests fixesintegration_fixesJoffrey F2015-01-091-35/+15
* | Added RO volumes testsJoffrey F2015-01-081-7/+99
* | Revert noop changeJoffrey F2015-01-081-10/+9
* | Merge branch 'master' of https://github.com/rmohr/docker-py into rmohr-masterJoffrey F2015-01-082-12/+30
|\ \
| * | Keep unix socket alive with python3Roman Mohr2014-12-212-12/+30
| |/
* | Prioritize system-installed urllib3 over requests vendored urllib3.Joffrey F2015-01-082-12/+9
* | Fix for issue #443Joffrey F2015-01-082-10/+28
* | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-01-082-1/+2
|\ \
| * \ Merge pull request #453 from kkleidal/registry_authJoffrey F2015-01-081-1/+1
| |\ \
| | * | removed exception thrown if registry.hub.docker.com is explicitly defined in ...Ken Leidal2015-01-081-1/+1
| |/ /
| * | Update mkdocs.ymlJoffrey F2014-12-271-0/+1
| |/
* | Bump version back to devJoffrey F2015-01-081-1/+1
|/
* Merge pull request #436 from docker/0.7.0-release0.7.0Joffrey F2014-12-199-107/+132
|\
| * Use create_host_config in start (unifying parameter processing)0.7.0-releaseJoffrey F2014-12-184-81/+27
| * Improved integration tests to run on python3 and close sessions after in tear...Joffrey F2014-12-181-22/+50
| * Fix create_container environment parameter for python3Joffrey F2014-12-181-2/+2
| * Updated documentationJoffrey F2014-12-182-1/+5
| * Added support for extra_hosts in create_host_configJoffrey F2014-12-181-1/+11
| * Updated changelogJoffrey F2014-12-181-0/+37
| * Bumped versionJoffrey F2014-12-181-1/+1
|/
* Merge pull request #427 from abanna/adding_multiple_dockercfg_supportJoffrey F2014-12-183-9/+49
|\
| * updated parameter name to make more sense.abanna2014-12-181-6/+4
| * missed a lint errorabanna2014-12-181-2/+4
| * adding the ability to login with different dockercfg files.Alex Banna2014-12-183-8/+48