summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'v1.1.2' into foobaserock/v1.1.2Paul Sherwood2014-08-07306-4802/+10034
|\ | | | | | | v1.1.2
| * Bump version to v1.1.2v1.1.2Victor Vieux2014-07-232-1/+10
| | | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
| * Copy values out of hostConfigMichael Crosby2014-07-231-1/+10
| | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael) Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: vieux)
| * Always mark as stopped for non running containersMichael Crosby2014-07-231-9/+9
| | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael) Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: vieux)
| * Add a conditional to contrib/init/sysvinit-debian/docker for Dash vs Bash ↵Tianon Gravi2014-07-231-1/+5
| | | | | | | | | | | | | | | | support Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon) Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com> (github: vieux)
| * Set state running before dumping to diskAlexandr Morozov2014-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes #4766 Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4) Conflicts: daemon/container.go Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: vieux)
| * Merge pull request #6915 from vieux/bump_v1.1.1Victor Vieux2014-07-099-78/+215
| |\ | | | | | | Bump v1.1.1
| | * Bump version to v1.1.1v1.1.1Victor Vieux2014-07-092-1/+6
| | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
| | * Tests for ADD tarTibor Vass2014-07-085-0/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass) Conflicts: integration-cli/docker_cli_build_test.go Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: vieux)
| | * Revert "improve untar when using files instead of directories. Specifies ↵Michael Crosby2014-07-082-71/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | behavior on non-existant targets." This reverts commit 1c8d3106df0bd2aba304c7b3863949ca11c2b133. Conflicts: archive/archive_test.go Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael) Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: vieux)
| | * Revert "allow overwrite in untar"Michael Crosby2014-07-082-12/+6
| |/ | | | | | | | | | | | | | | This reverts commit 5a3d774e5651da772a065282a1fb1a31e19e911c. Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael) Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: vieux)
| * Merge pull request #6818 from vieux/bump_v1.1.0Victor Vieux2014-07-03302-4796/+9869
| |\ | | | | | | Bump v1.1.0
| | * Bump version to v1.1.0v1.1.0Victor Vieux2014-07-032-1/+25
| | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
| | * Merge pull request #6825 from SvenDowideit/fix-man-page-merge-messSven Dowideit2014-07-0313-70/+13
| | |\ | | | | | | | | missed these merge conflicts when manually rebasing too many files
| | | * missed these merge conflicts when manually rebasing too many filesSvenDowideit2014-07-0313-70/+13
| | |/ | | | | | | | | | Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
| | * Merge pull request #6824 from fredlf/1-1_release_notesSven Dowideit2014-07-031-25/+65
| | |\ | | | | | | | | Added Release Notes
| | | * Corrected version number to 3 digits.Fred Lifton2014-07-021-1/+1
| | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
| | | * Added Release NotesFred Lifton2014-07-021-25/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Release notes for v.1.1 have been added to the docs index.md page. Made some revisions to other content to make it shorter. Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
| | * | Merge pull request #6819 from vieux/update_release_checklist_and_gitcommitSven Dowideit2014-07-032-2/+2
| | |\ \ | | | | | | | | | | update release checklist and .gitignore
| | | * | update release checklist and .gitignoreVictor Vieux2014-07-022-2/+2
| | | |/ | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
| | * | Merge pull request #6807 from SvenDowideit/convert-more-docker.io-to-docker.comFred Lifton2014-07-0258-71/+126
| | |\ \ | | | | | | | | | | some docker.io -. docker.com conversions
| | | * | I'm going to wish I didn't do thisSvenDowideit2014-07-0358-71/+126
| | |/ / | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
| | * | Merge pull request #6790 from SvenDowideit/pr_out_update_cli_mdFred Lifton2014-07-0240-356/+712
| | |\ \ | | | |/ | | |/| update cli.md
| | | * Update cli.md and man pages to match current cliSvenDowideit2014-07-0340-327/+683
| | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
| | | * Fixed numerous inconsistencies in command help textJames Turnbull2014-07-031-29/+29
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replaced docker with Docker. * Consistently used STDIN, STDOUT, STDERR. * Consistently used TTY. * Fixed some grammar and spelling issues. * Fixed references to the index. Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01) Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: SvenDowideit)
| | * Merge pull request #6808 from vieux/pr_6806Victor Vieux2014-07-022-5/+20
| | |\ | | | | | | | | Add backwards READ compatibility for the old libcontainer API
| | | * fix compilation and panicVictor Vieux2014-07-021-2/+2
| | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
| | | * Add backwards READ compatibility for the old libcontainer APITibor Vass2014-07-022-5/+20
| | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
| | * | Merge pull request #6780 from unclejack/tweak_cli_integration_testsTibor Vass2014-07-023-16/+29
| | |\ \ | | | | | | | | | | Tweak cli integration tests
| | | * | integcli: add & use pullImageIfNotExist for pullsunclejack2014-07-022-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This speeds up the tag cli integration tests by about 20 seconds. Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
| | | * | make TestRemoveContainerRunning handle signalsunclejack2014-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lowers the test execution time by about 5 seconds. Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
| | | * | integration cli: add imageExists to docker utilsunclejack2014-06-301-0/+9
| | | | | | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
| | * | | Merge pull request #6763 from folieadrien/masterunclejack2014-07-023-25/+48
| | |\ \ \ | | | | | | | | | | | | Migrate TestGetImagesHistory into unit and CLI test
| | | * | | Add missing test for full coverageAdrien Folie2014-06-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
| | | * | | Migrate TestGetImagesHistory into unit and CLI testAdrien Folie2014-06-303-25/+45
| | | | | | | | | | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
| | * | | | Merge pull request #6814 from tianon/more-init-ulimitTianon Gravi2014-07-022-0/+6
| | |\ \ \ \ | | | |_|_|/ | | |/| | | Add NOFILE and NPROC ulimit settings to OpenRC and SysVinit
| | | * | | Add NOFILE and NPROC ulimit settings to the SysV init scriptTianon Gravi2014-07-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
| | | * | | Add NOFILE and NPROC ulimit settings to the OpenRC init scriptTianon Gravi2014-07-021-0/+3
| | |/ / / | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
| | * | | Merge pull request #6789 from ↵Fred Lifton2014-07-013-5/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | SvenDowideit/pr_out_expand_to_used_b2d_vm_on_any_of_the_platforms expand to 'used b2d vm on any of the platforms'
| | | * | | convert OSX into OS XSven Dowideit2014-07-013-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
| | | * | | expand to 'used b2d vm on any of the platforms'SvenDowideit2014-07-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
| | | * | | Update usingdocker.mdTom Maaswinkel2014-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boot2docker on windows also uses an IP of its own. Docker-DCO-1.1-Signed-off-by: Tom Maaswinkel <tom.maaswinkel@12wiki.eu> (github: SvenDowideit)
| | * | | | Merge pull request #6748 from LK4D4/increase_max_patricia_prefixTibor Vass2014-07-015-18/+22
| | |\ \ \ \ | | | | | | | | | | | | | | Increase max patricia prefix
| | | * | | | Increase patricia.MaxPrefixPerNodeLK4D42014-06-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows to avoid redundant prefix splits Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
| | | * | | | Update go-patricia to v1.0.1LK4D42014-06-284-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
| | * | | | | Merge pull request #6781 from anweiss/6738-dscarticleFred Lifton2014-07-012-0/+118
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Add Article for PowerShell DSC
| | | * | | | | add DSC articleAndrew Weiss2014-07-012-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com> (github: anweiss)
| | * | | | | | Merge pull request #6788 from SvenDowideit/remote-bang-from-hello-worldJames Turnbull2014-07-015-19/+19
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | removing the exclaimation mark from our hello-world examples, some users...
| | | * | | | | | Lowercase world, because its not important.Sven Dowideit2014-07-015-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
| | | * | | | | | removing the exclaimation mark from our hello-world examples, some users get ↵SvenDowideit2014-07-013-12/+12
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trapped by the shell Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
View Lorry Controller Status