unclejack
c41c00cab4
Merge pull request #6785 from tiborvass/use_new_libcontainer_state_api
...
Use new libcontainer.State API
2014-07-01 19:44:07 +03:00
James Turnbull
6ac20416c8
Merge pull request #6796 from jpetazzo/bundled-vs-packaged
...
Add FAQ entry about bundled vs packaged libraries
2014-07-01 11:11:48 -04:00
Jérôme Petazzoni
ae1ff4dea3
Add FAQ entry about bundled vs packaged libraries
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
2014-07-01 07:47:59 -07:00
Solomon Hykes
bc33ce0d8f
Merge pull request #6366 from proppy/add-proppy-server
...
api/MAINTAINERS: add proppy for server/
2014-06-30 17:44:02 -07:00
Eric Windisch
17d870bed5
Pause/freeze containers during commit
...
Initiates a pause before committing a container,
adds a pause option to the commit command, defaulting to 'true'.
Fixes bug: #6267
Fixes bug: #3675
Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com> (github: ewindisch)
2014-07-01 00:30:21 +00:00
Sven Dowideit
3f18afc94c
Merge pull request #6764 from SvenDowideit/pr_out_blindly_make_all_uses_of_e_g_into_e_g_
...
blindly make all uses of e\.?g\.? into e.g.,
2014-07-01 09:57:39 +10:00
SvenDowideit
fde10cf87b
blindly make all uses of e\.?g\.? into e.g.,
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-01 09:55:19 +10:00
Christian Berendt
b44e13ae02
Fixed typographical erros in the documentation
...
Used the RETF rules provided by Wikipedia to fix some typographical
errors in the Markdown files of the documentation with the following
script:
https://github.com/openstack/openstack-doc-tools/tree/master/cleanup/retf
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de> (github: berendt)
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de> (github: SvenDowideit)
2014-07-01 09:54:20 +10:00
Victor Vieux
e6d9c097b2
Merge pull request #6749 from LK4D4/update_gorilla_context
...
Update gorilla/context
2014-06-30 16:52:34 -07:00
Tibor Vass
262d45e0fe
Use new libcontainer.State API
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-06-30 18:27:15 -04:00
Tianon Gravi
ff45a3cbac
Merge pull request #6784 from tianon/NikolaMandic-master
...
Update contrib/mkimage-arch.sh to remove use of "expect" since the output of pacstrap has changed
2014-06-30 16:04:09 -06:00
Tianon Gravi
75b3b382ca
Merge branch 'master' of https://github.com/NikolaMandic/docker into NikolaMandic-master
...
* 'master' of https://github.com/NikolaMandic/docker :
removed expect from mkimage-arch since it was not working
Conflicts:
contrib/mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-30 15:52:04 -06:00
unclejack
63e28cc363
make TestRemoveContainerRunning handle signals
...
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)
2014-06-30 22:25:50 +03:00
unclejack
eb1e8e884d
integration cli: add imageExists to docker utils
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-06-30 22:22:29 +03:00
Tibor Vass
36c78c9172
Merge pull request #6742 from vieux/remove_deprecate_syntax
...
remove deprecated syntax for docker commit
2014-06-30 10:41:07 -04:00
Tibor Vass
fef1e0a708
Merge pull request #6682 from erikh/6476-persistent_port_allocation
...
fix persistent port allocation
2014-06-30 10:14:17 -04:00
James Turnbull
7128353be5
Merge pull request #6766 from jamtur01/clirun
...
Formatting and consistency fixes to CLI and RUN references
2014-06-30 08:21:57 -04:00
Sven Dowideit
8d1cc68673
Merge pull request #6765 from SvenDowideit/pr_out_use_the_official_image_for_now_there_s_an_opensuse_image_on_its_way
...
use the official image for now - there's an opensuse image on its way
2014-06-30 20:00:12 +10:00
Sven Dowideit
753ff36cc3
Merge pull request #6768 from SvenDowideit/add-1.13-api-to-docs-menu
...
Add the 1.13 API docs to the menu
2014-06-30 19:59:39 +10:00
Adrien Folie
c2699d8d89
Add missing test for full coverage
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
2014-06-30 09:36:46 +00:00
SvenDowideit
26332fe339
Add the 1.13 API docs to the menu
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-06-30 14:19:16 +10:00
Sven Dowideit
b4df555d27
Merge pull request #6544 from mheon/sigproxy_docs
...
Update --sig-proxy documentation
2014-06-30 13:16:38 +10:00
James Turnbull
8c765ae68a
Formatting and consistency fixes to CLI and RUN references
...
* Removed double backticks.
* Reformatted paragraphs.
* Fixed consistent STDOUT/STDIN/STDERR references.
* Fixed several broken URLs.
* Fixed backtick mismatches.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-29 22:25:12 -04:00
SvenDowideit
24bf8faa99
use the official image for now - there's an opensuse image on its way
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-06-30 11:46:09 +10:00
Sven Dowideit
0757a5663a
Merge pull request #6631 from SvenDowideit/add-versioning-to-docs-output
...
Add versioning to docs output
2014-06-30 11:38:04 +10:00
James Turnbull
860d8e9271
Merge pull request #6761 from fgrehm/patch-1
...
Remove extra "Docker" from docs index
2014-06-29 20:14:16 -04:00
Adrien Folie
9a2771eac2
Migrate TestGetImagesHistory into unit and CLI test
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
2014-06-30 01:31:16 +02:00
Fabio Rehm
3be683a0bb
Remove extra "Docker" from docs index
2014-06-29 19:45:08 -03:00
Sven Dowideit
2075ef029e
Merge pull request #6747 from softprops/master
...
added linkage to tugboat, a scala client library
2014-06-29 16:21:32 +10:00
doug tangren
5c0819a046
added linkage to tugboat, a scala client
...
Docker-DCO-1.1-Signed-off-by: Doug Tangren <d.tangren@gmail.com> (github: softprops)
2014-06-28 23:21:40 -04:00
Sven Dowideit
7362a09cd9
Merge pull request #6752 from mchelen/patch-5
...
fix typo
2014-06-29 08:29:12 +10:00
Sven Dowideit
525d41118e
Merge pull request #6751 from mchelen/patch-3
...
missing `sudo`
2014-06-29 08:28:46 +10:00
Mike Chelen
0d2656ce6e
fix typo
2014-06-28 12:26:36 -04:00
Mike Chelen
4a5f09387e
missing `sudo`
2014-06-28 12:01:16 -04:00
LK4D4
ea464ea212
Update gorilla/context
...
Race condition was fixed recently
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-28 12:38:29 +04:00
LK4D4
095cb7a818
Increase patricia.MaxPrefixPerNode
...
It allows to avoid redundant prefix splits
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-28 12:27:44 +04:00
LK4D4
2edfb1e696
Update go-patricia to v1.0.1
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-28 12:20:31 +04:00
Sven Dowideit
4a9dc8d73d
Merge pull request #6741 from fredlf/suse-install-fix
...
Changed add to group command to include -a (append) flag, for safety. In...
2014-06-28 10:43:11 +10:00
Victor Vieux
1960da1dd0
Merge pull request #6713 from vieux/order_flag
...
sort flags with the same name in a consistent order
2014-06-27 17:10:55 -07:00
Victor Vieux
a0b2290713
remove deprecated syntax for docker commit
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-27 23:09:41 +00:00
Erik Hollensbe
2cdcfc0c57
portmapper: unit tests for remap problem
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-06-27 15:57:31 -07:00
Fred Lifton
ff20637499
Merge pull request #6680 from mheon/cgroup_memory
...
Update docker-run manpage
2014-06-27 14:39:03 -07:00
Fred Lifton
018f887fe1
Merge pull request #6731 from mchelen/patch-2
...
Update dockerimages.md
2014-06-27 14:37:12 -07:00
Fred Lifton
74a34bb1fe
Merge pull request #6678 from mheon/fix_man_generate
...
Path fixes in md2man script and README
2014-06-27 14:29:36 -07:00
Michael Crosby
e5d3aa2765
Merge pull request #6740 from tiborvass/untar_allow_overwrite
...
Allow overwrite in archive.Untar
2014-06-27 14:15:47 -07:00
Tibor Vass
5a3d774e56
allow overwrite in untar
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-06-27 17:03:51 -04:00
Michael Crosby
680adb98e1
Merge pull request #6232 from LK4D4/wait_functions_for_state
...
Wait functions for state
2014-06-27 13:33:13 -07:00
Michael Crosby
3aa75210c4
Merge pull request #6721 from LK4D4/integration_test_on_links
...
Integration cli tests on Links in inspect
2014-06-27 13:29:13 -07:00
Fred Lifton
0acec44374
Changed add to group command to include -a (append) flag, for safety. In response to customer email.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-06-27 12:45:55 -07:00
Alexandr Morozov
08182da5d8
Integration cli tests on Links in inspect
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-27 22:44:13 +04:00