summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'lukemarsden-volume_driver' into 1.3.0-dev1.3.0-devJoffrey F2015-06-166-8/+47
|\
| * Bumped default API version == 1.19Joffrey F2015-06-162-2/+2
| |
| * Only allow volume_driver param if API version >= 1.19Joffrey F2015-06-161-3/+8
| |
| * Add volume_driver param to client.create_containerLuke Marsden2015-06-034-3/+37
| | | | | | | | | | | | | | - Add appropriate test which also asserts that volume names can be passed through to drivers. - Add new param to docs. Signed-off-by: Luke Marsden <luke@clusterhq.com>
* | Merge branch 'bcicen-add-raise-for-status-to-push-pull-methods' into 1.3.0-devJoffrey F2015-06-161-10/+17
|\ \
| * | Enforce consistent style for push and pull methodsJoffrey F2015-06-161-10/+13
| | |
| * | Add raise_for_status check to push and pull methodsBradley Cicenas2015-06-131-0/+4
| |/ | | | | | | as underlying exceptions(such as push already in progress) will be hidden in the stream generator otherwise.
* | Merge branch 'bo0ts-Decode-for-build' into 1.3.0-devJoffrey F2015-06-162-3/+6
|\ \
| * | small doc fixesJoffrey F2015-06-161-3/+3
| | |
| * | Add and document a decode parameter for buildPhilipp Möller2015-06-152-2/+5
| |/ | | | | | | | | This makes the build method consistent with the events method and adds some convenience.
* | Bumped version to 1.3.0 (dev)Joffrey F2015-06-161-1/+1
| |
* | Updated ChangeLog for 1.2.31.3.0-rc0Joffrey F2015-06-161-1/+28
| |
* | Bump RC1.2.3-rc1Joffrey F2015-06-121-1/+1
| |
* | Merge branch 'aanand-allow-binds-list' into 1.3.0-rc0Joffrey F2015-06-124-2/+57
|\ \
| * | Allow binds to be specified as a list of stringsAanand Prasad2015-06-123-0/+46
| |/ | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * Merge pull request #612 from ibuildthecloud/fix-readonlyMaxime Petazzoni2015-05-261-1/+1
| |\ | | | | | | Typo in ReadonlyRootfs
| | * Typo in ReadonlyRootfsDarren Shepherd2015-05-251-1/+1
| |/ | | | | | | read_only parameter does not work because the wrong name is sent to Docker
| * Merge pull request #562 from smothiki/memsJoffrey F2015-05-202-1/+10
| |\ | | | | | | make memory units compatible with native docker cli
| | * make memory units compatible with native docker clismothiki2015-05-072-1/+10
| | | | | | | | | | | | Signed-off-by: sivaram mothiki <smothiki@engineyard.com>
* | | Changelog WIP1.2.3-rc0Joffrey F2015-05-261-0/+6
| | |
* | | Bumped version (rc)Joffrey F2015-05-261-2/+2
|/ /
* | Merge branch 'tonicbupt-privilege'Joffrey F2015-05-201-2/+7
|\ \
| * | Only allow privileged exec_create for API version >= 1.19Joffrey F2015-05-201-2/+6
| | |
| * | Merge branch 'privilege' of https://github.com/tonicbupt/docker-py into ↵Joffrey F2015-05-201-2/+3
| |\ \ |/ / / | | | | | | tonicbupt-privilege
| * | add privilege for exec_createtonic2015-05-081-2/+3
| | |
* | | Merge branch 'posita-raise-on-inspect-empty-string-602'Joffrey F2015-05-203-5/+26
|\ \ \
| * | | Separate check_resource inspect testsJoffrey F2015-05-201-13/+20
| | | |
| * | | Fixed check_resource decoratorJoffrey F2015-05-201-5/+3
| | | |
| * | | Merge branch 'raise-on-inspect-empty-string-602' of ↵Joffrey F2015-05-203-0/+16
| |\ \ \ |/ / / / | | | | | | | | https://github.com/posita/docker-py into posita-raise-on-inspect-empty-string-602
| * | | Fix #602. Raise ValueError on empty argument to inspect_{container,image}() ↵Matt Bogosian2015-05-173-0/+16
| | | | | | | | | | | | | | | | methods.
* | | | Merge pull request #606 from bo0ts/patch-1Joffrey F2015-05-201-2/+1
|\ \ \ \ | |/ / / |/| | | Remove non-existing argument
| * | | Remove non-existing argumentPhilipp Moeller2015-05-201-2/+1
|/ / / | | | | | | There is no container argument in create_container_config. This is probably a leftover when this was copied from the Client.start documentation
* | | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-05-139-614/+236
|\ \ \
| * \ \ Merge pull request #598 from HackToday/fixparameterJoffrey F2015-05-121-1/+1
| |\ \ \ | | | | | | | | | | Fix the parameter mismatch
| | * | | Fix the parameter mismatchHackToday2015-05-121-1/+1
| |/ / / | | | | | | | | | | | | Closes-Issue: #597
| * | | Fix typo in deprecated insert method. Fixes #595Maxime Petazzoni2015-05-111-1/+1
| | | | | | | | | | | | s/fornat/format/
| * | | Merge pull request #593 from docker/deprecate_start_hostconfigJoffrey F2015-05-088-612/+232
| |\ \ \ | | | | | | | | | | Deprecate start hostconfig
| | * | | Removed instances of using host_config in start from docs and examplesdeprecate_start_hostconfigJoffrey F2015-05-085-111/+40
| | | | |
| | * | | Added deprecation warning for host config in startJoffrey F2015-05-083-501/+192
| | | |/ | | |/|
| * | | Merge pull request #592 from docker/cpusetcpusJoffrey F2015-05-082-0/+2
| |\ \ \ | | |/ / | |/| | Set 'CpusetCpus' with the value of the cpuset param in create_container
| | * | unit testcpusetcpusJoffrey F2015-05-081-0/+1
| | | |
| | * | Set 'CpusetCpus' with the value of the cpuset param in create_containerJoffrey F2015-05-081-0/+1
| |/ /
* | | Merge branch 'proppy-add-maintainer-file'Joffrey F2015-05-131-0/+3
|\ \ \ | |/ / |/| |
| * | Added Maxime to maintainersJoffrey F2015-05-131-0/+2
| | |
| * | Merge branch 'add-maintainer-file' of https://github.com/proppy/docker-py ↵Joffrey F2015-05-131-0/+1
| |\ \ |/ / / | | | | | | into proppy-add-maintainer-file
| * | add MAINTAINERSJohan Euphrosine2015-04-211-0/+1
| | |
* | | Merge pull request #590 from docker/events_decode_docJoffrey F2015-05-071-3/+4
|\ \ \ | | | | | | | | Added documentation for decode param on stats and events
| * | | Added documentation for decode param on stats and eventsevents_decode_docJoffrey F2015-05-071-3/+4
|/ / /
* | | Merge pull request #587 from docker/fix-586Joffrey F2015-05-063-3/+6
|\ \ \ | |_|/ |/| | Fixes for "make integration-test"
| * | dev versionfix-586Joffrey F2015-05-061-1/+1
| | |
View Lorry Controller Status