7be83a0857
Merge pull request #6669 from pwaller/issue-6652
...
Allow re-mounting an existing mount with "remount"
2014-06-25 14:18:25 -07:00
f87afda123
Allow re-mounting an existing mount with "remount"
...
Without this line of code, if a volume is present in /proc/mounts,
it cannot be remounted with new mount options.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-06-25 22:06:24 +01:00
b85f20cf13
Merge pull request #6666 from erikh/fix-escaping-whitespace
...
fix whitespace that precedes the escape in a multiline string.
2014-06-25 17:03:19 -04:00
03c5c1930d
fix whitespace that precedes the escape in a multiline string.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-06-25 13:39:47 -07:00
01d4fd76dd
Merge pull request #6656 from andersryanc/master
...
Remove Docs viewport tag to fix iPhone scaling
2014-06-24 20:16:47 -07:00
11902d4ccb
Merge pull request #6658 from amuino/doc_pause_unpause
...
Document the pause and unpause commands available on API v1.12 onwards
2014-06-25 10:00:36 +10:00
c72cfa8d45
Merge pull request #6659 from vieux/pr_6248
...
Change floats to ints recursively on env encoding
2014-06-24 16:51:28 -07:00
1d3d1c5d2b
Change floats to ints recursively on env encoding
...
Fixes #6246
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-24 23:39:26 +00:00
e899700254
Merge pull request #6651 from erikh/6002-conflicting-iptables-options
...
Add mutex warning when specifying -icc or -ip-forward and -iptables=false
2014-06-24 15:56:05 -07:00
05f293e65e
Add mutex warning when specifying -icc or -ip-forward and -iptables=false
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-06-24 15:49:35 -07:00
901a47daff
Document the pause and unpause commands available on API v1.12 onwards
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com > (github: amuino)
2014-06-25 00:41:57 +02:00
7b1dd54d5d
Remove viewport tag to fix iPhone scaling
2014-06-24 15:16:40 -07:00
4f5e91e3b4
Merge pull request #6654 from vieux/fix_test_search
...
Fix search integration-cli test
2014-06-24 17:51:07 -04:00
11ef08402a
Merge pull request #6629 from SvenDowideit/move-man-pages-to-docs
...
move the man pages to the docs/ dir
2014-06-25 07:50:09 +10:00
6d8e95557c
Merge pull request #6643 from kzys/freebsd-cp
...
cp's -T and --reflink=auto are only available on GNU coreutils
2014-06-24 14:29:18 -07:00
dd258553b1
Fix search integration-cli test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-24 21:16:34 +00:00
408963ed4d
Merge pull request #6650 from crosbymichael/update-libcontainer-post-refactor
...
Update libcontainer dep to 5210a236b92a8022a673108f347
2014-06-24 13:51:04 -07:00
1059e166fd
Merge pull request #6595 from LK4D4/env_benchmarks
...
Benchmarks for engine/env
2014-06-24 23:35:00 +03:00
c4dbd4f7c0
Merge pull request #6648 from LK4D4/truncindex_bench
...
Truncindex benchmarks
2014-06-24 22:10:33 +03:00
f6d11c8d50
Merge pull request #6216 from gsalgado/convert-integration-tests
...
Convert integration/api_test:TestGetEvents into a unit test and a CLI test
2014-06-24 14:53:10 -04:00
1dc8e2ffab
Rename libcontainer.Container to libcontainer.Config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-24 11:31:03 -07:00
cee6f4506c
Update libcontainer references
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-24 11:31:03 -07:00
423a8f91d7
Update libcontainer to 5210a236b92a8022a673108f347
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-06-24 11:30:36 -07:00
01b424028e
Benchmarks for engine/env
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-24 21:48:16 +04:00
7eb425ccd1
Improve truncindex benchmarks
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-24 21:41:51 +04:00
e23e3a1600
Merge pull request #5413 from SvenDowideit/docker-info-list-sockets
...
Add Sockets (-H) list to `docker -D info`.
2014-06-24 10:40:53 -07:00
ed032ddfd6
Move truncindex in separate package in pkg/
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-24 21:19:15 +04:00
1c291ccbbe
Migrate TestGetEvents into a unit and a CLI test
...
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com > (github: gsalgado)
2014-06-24 17:43:26 +02:00
733711481e
cp's -T and --reflink=auto are only available on GNU coreutils
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-06-24 23:58:17 +09:00
f1ac8962f9
Merge pull request #6633 from SvenDowideit/avoid-extra-gravatar-download
...
Lets not download the gravatar and then download a different one after t...
2014-06-23 23:58:15 -07:00
c7a1bdf6c0
Lets not download the gravatar and then download a different one after the js is triggered
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-24 14:48:29 +10:00
42be6f2957
move the man pages to the docs/ dir
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-24 13:07:42 +10:00
cf513185b0
move api docs to APIv1.13
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-06-24 12:25:18 +10:00
f54823bf05
Add Sockets (-H) list to docker -D info.
...
This will allow us to _know_ what the user's -H settings are, which may
be useful for debugging later.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-06-24 12:25:17 +10:00
664ba0c031
Merge pull request #6624 from jezenielzapanta/patch-1
...
Fix typo in the docs.
2014-06-23 19:20:20 -07:00
67ba305841
Merge pull request #6623 from rogaha/fix_header_links
...
Fix header and About Docker links
2014-06-24 12:18:29 +10:00
d7587aa976
Merge pull request #4812 from kzys/freebsd-mount
...
FreeBSD support on pkg/mount
2014-06-23 17:45:25 -07:00
6a762e8594
Merge pull request #6620 from vieux/deprecate_tag_args
...
Remove old tag format
2014-06-23 17:24:20 -07:00
28c22cb7f9
Merge pull request #6599 from SvenDowideit/6478-update-fedora
...
Update fedora.md
2014-06-23 17:23:00 -07:00
b49cfaffa8
Merge pull request #6617 from ifraixedes/patch-1
...
Update dockervolumes.md
2014-06-24 08:50:27 +10:00
2d195fb6f8
Merge pull request #5715 from proppy/context-tar
...
allow docker build - to accept a context tar from stdin
2014-06-23 15:33:21 -07:00
14ee021885
Merge pull request #6539 from LK4D4/fix_large_frame_in_stdcopy
...
Fix stdcopy when reads large frame at once
2014-06-23 13:52:30 -07:00
edcb41451a
api/client/build: allow tar as context for docker build -
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-06-23 13:34:09 -07:00
3f600c831b
Merge pull request #6621 from LK4D4/move_sorter_tests_to_integration_cli
...
Move sorter_test from integration to integration-cli
2014-06-23 13:17:37 -07:00
cf6834d797
Fix typo in the docs.
...
Fix a minor typographical error inside `run.md`.
2014-06-24 03:26:22 +08:00
edf16383c6
Fix header and about Docker links
2014-06-23 18:35:15 +00:00
386d1ecc6e
Move sorter_test from integration to integration-cli
...
TestServerListOrderedImagesByCreationDateAndTag was redundant and broken
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-06-23 22:19:52 +04:00
62b2b1bac3
Merge pull request #6532 from jonboulle/fix_capitals
...
be consistent in capitalization of Docker
2014-06-23 11:14:27 -07:00
8228d0e2bb
Remove old tag format
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-06-23 17:52:03 +00:00
c32036fa9b
Merge pull request #6585 from kzys/runconfig-fatalf
...
Fatal() doesn't take a format string like Fatalf()
2014-06-23 10:24:01 -07:00
Michael Crosby