summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Handle decimal values in parse_bytes813-parse-float-bytesJoffrey F2015-12-182-7/+34
* Merge pull request #863 from thomasboyt/fast-exclude-pathsAanand Prasad2015-12-163-27/+62
|\
| * Improve get_paths performance by not descending into ignored directoriesThomas Boyt2015-12-083-27/+62
* | Merge pull request #874 from aanand/fix-index.docker.ioAanand Prasad2015-12-163-47/+91
|\ \
| * | Treat 'index.docker.io' repo names as 'docker.io'Aanand Prasad2015-12-102-8/+38
| * | Refactor resolve_authconfig testsAanand Prasad2015-12-102-38/+52
| * | Allow overriding of positional args to py.test in tox.iniAanand Prasad2015-12-101-1/+1
|/ /
* | Bumped versionJoffrey F2015-12-091-1/+1
* | Merge pull request #871 from thaJeztah/update-maintainersJoffrey F2015-12-091-5/+52
|\ \
| * | update maintainers file for parsingSebastiaan van Stijn2015-12-091-5/+52
* | | Merge pull request #867 from sumitsahrawat/network-create-optionsAanand Prasad2015-12-096-10/+76
|\ \ \ | |/ / |/| |
| * | Fix #869: Add docs for network apiSumit Sahrawat2015-12-101-0/+62
| * | Fix remove_volume return valueSumit Sahrawat2015-12-104-7/+3
| * | Allow providing options when creating networksSumit Sahrawat2015-12-102-3/+11
|/ /
* | Merge pull request #868 from jstewmon/config-stop-signalJoffrey F2015-12-084-3/+30
|\ \
| * | added stop_signal to create container configJonathan Stewmon2015-12-034-3/+30
* | | Merge pull request #865 from dlorenc/masterJoffrey F2015-12-081-5/+6
|\ \ \ | |_|/ |/| |
| * | Allow utils.tar to take an existing file object.dlorenc2015-11-301-5/+6
* | | Merge pull request #854 from lots0logs/840-add-exception-utility-method-for-c...Aanand Prasad2015-12-043-61/+67
|\ \ \
| * | | incorporate feedbackDustin Falgout2015-12-043-46/+45
| * | | Use new methods to raise exceptions in create_host_config.Dustin Falgout2015-12-032-36/+30
| * | | resolve merge conflictDustin Falgout2015-12-031-10/+23
|/ / /
* | | Merge pull request #858 from TomasTomecek/improve-exec-apiDaniel Nephin2015-12-036-54/+94
|\ \ \ | |_|/ |/| |
| * | allow interactive execTomas Tomecek2015-12-035-53/+92
| * | make,integration-dind: try to remove dpy-dindTomas Tomecek2015-12-021-0/+1
| * | tests,integration: ensure container is removed if start failsTomas Tomecek2015-12-021-1/+1
|/ /
* | Merge pull request #866 from ticosax/fix-volume-listingDaniel Nephin2015-12-012-1/+13
|\ \
| * | fix typo filter param for `volumes`Nicolas Delaby2015-12-012-1/+13
| |/
* | Merge pull request #864 from ticosax/document-network_modeDaniel Nephin2015-12-011-2/+2
|\ \ | |/ |/|
| * network_mode can also take the name of a network as value.Nicolas Delaby2015-12-011-2/+2
* | Merge pull request #862 from docker/1.6.0-release1.6.0Joffrey F2015-11-302-1/+40
|\ \
| * | Update Changelog with one last bugfix1.6.0-releaseJoffrey F2015-11-301-1/+4
| * | Bump versionJoffrey F2015-11-231-1/+1
| * | Update ChangelogJoffrey F2015-11-231-0/+36
* | | Merge pull request #861 from docker/860-deprecate-resolve-repo-nameJoffrey F2015-11-305-55/+101
|\ \ \ | |_|/ |/| |
| * | Add tests for new cases covered by parse_repository_tag860-deprecate-resolve-repo-nameJoffrey F2015-11-241-14/+46
| * | 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