0579fb2aaa
Merge pull request #15031 from liubin/typo/liubin-change-restart-command
...
Change restarting Docker daemon command in CentOS
Upstream-commit: db647c3b603ed6cd4a792473ab6e88304d38a07a
Component: engine
2015-07-27 10:54:55 -07:00
1b5a1d2d53
Merge pull request #14547 from duglin/ErrDeadExec
...
Return 404 on exec-inspect when container is dead but exec is still around
Upstream-commit: 4dbdd98b4142dbda1c6028c17a9a0d6dd8cdce04
Component: engine
2015-07-27 10:46:32 -07:00
820dfff766
Merge pull request #13834 from hqhq/hq_memswap_change
...
Set default MemorySwap on Docker side
Upstream-commit: 6e1d887722d2ce56c67f2d85b78a69672952e3a7
Component: engine
2015-07-27 10:46:10 -07:00
6356a946a6
Merge pull request #14118 from mountkin/fix-rmi-force
...
raise an error if rmi -f with multiple tags and running container
Upstream-commit: 33bd41df94a3fa81e3b011602008a31a57a5ca68
Component: engine
2015-07-27 10:42:07 -07:00
912083897d
Merge pull request #14278 from squaremo/separate_overlay_docs
...
Put the network UI and overlay docs in separate files
Upstream-commit: a62dabe0b4324475c24f1835d788af49d819aafa
Component: engine
2015-07-27 10:41:17 -07:00
2203799750
Merge pull request #14560 from bkeyoumarsi/volume-plugin-doc-fix
...
Updated volume-driver plugin api docs
Upstream-commit: fdb932fa17f4af2d54d3ceecc753e841242f8b1c
Component: engine
2015-07-27 10:39:15 -07:00
4f0e936463
Merge pull request #14735 from charleswhchan/patch-1
...
Minor edits to Environment variables section
Upstream-commit: f3af9c8bdb68e5db7aaed7aec11aa2a78fd7e546
Component: engine
2015-07-27 10:37:39 -07:00
58f2d2b582
Merge pull request #14852 from rhatdan/relabel
...
Rename internal field Relabel to Mode
Upstream-commit: 2f5dc43ca204c5d6e48abf5f64a46e150f3d0bfd
Component: engine
2015-07-27 10:31:08 -07:00
7e7519f5f0
Merge pull request #14875 from brahmaroutu/lint_daemon_graphdriver_btrfs
...
daemon/graphdriver/btrfs fix lint errors/warnings
Upstream-commit: 303345dc6a5179684bfe5f78ad9b3d73aba93d0e
Component: engine
2015-07-27 10:28:50 -07:00
6f66e6db3b
Merge pull request #14899 from mountkin/fix-exec-resize-panic
...
fix the panic caused by resizing a starting exec
Upstream-commit: 70842ea942326b2a3be3b504a7f5038ba68f07f1
Component: engine
2015-07-27 10:27:29 -07:00
1237e8ea97
Merge pull request #14959 from runcom/remove-pkg-systemd-booted-go
...
Remove pkg/systemd/booted.go
Upstream-commit: b48b6de623cb45509e4cf45d3b5b1b5d29a7e9d9
Component: engine
2015-07-27 10:22:58 -07:00
e610dff696
Merge pull request #14971 from moxiegirl/man-page-carry-14637
...
Carry man page for the load command
Upstream-commit: 5329d28536c5b75a42d5cb54a5b21e1f8791e914
Component: engine
2015-07-27 10:18:44 -07:00
9093f9669d
Merge pull request #14981 from calavera/bump_api_version
...
Bump api version to 1.21.
Upstream-commit: 912bafcf3636ce1de242177a144c727e965b97be
Component: engine
2015-07-27 10:17:24 -07:00
64e4bbc853
Merge pull request #15009 from larchunix/devel
...
Fix docker-rm man page formatting
Upstream-commit: 35250b685ccd2f1632064a0cf106fd7f592514a4
Component: engine
2015-07-27 10:16:57 -07:00
ae24227f7b
Merge pull request #15028 from vbatts/typo
...
api/client/build: typo in error
Upstream-commit: c451d597f2abef42bd26212d18844a03c3773818
Component: engine
2015-07-27 10:13:05 -07:00
704cf2735f
Merge pull request #15010 from runcom/14947-fix-inspect-time-RFC3339Nano
...
Format times in inspect command with a template as RFC3339Nano
Upstream-commit: e89aec0dfb2dd4a5decc11ea008f3ab179e8d5f8
Component: engine
2015-07-27 10:08:21 -07:00
56f08785e1
Merge pull request #14988 from ChanderG/master
...
Fix minor typo in Debian installation docs
Upstream-commit: f0f753d70aee870a1d5b2c5638b1ead108353100
Component: engine
2015-07-27 09:51:58 -07:00
a4c7971630
Bump api version to 1.21.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0eb88a0751365050cb177e16196622fd1d322efc
Component: engine
2015-07-27 09:48:47 -07:00
2f4d49931d
Merge pull request #14974 from duglin/BetterTrustErr
...
Show exact file being parsed on error.
Upstream-commit: b2930933c903c74644edc506bfc45989d470886e
Component: engine
2015-07-27 09:39:48 -07:00
af395c292f
Merge pull request #14917 from srust/14915-empty-hostconfig-on-create
...
Check for nil before using HostConfig to adjustCpuShares
Upstream-commit: ec8173b5171b7f7cd4816453bdf714fec8d22353
Component: engine
2015-07-27 09:38:32 -07:00
f054a3e5b4
Merge pull request #14786 from brahmaroutu/lint_image
...
image fix lint errors/warnings
Upstream-commit: ae5c8e3b69fbde82390f8665c0110896a90e14bc
Component: engine
2015-07-27 09:25:30 -07:00
d4728ca93c
Merge pull request #15007 from cles/arch-systemd-network-issue
...
Add arch install docs warning about systemd-network
Upstream-commit: 6c0c6b120ac4ea05301b584c3b84f7e875f542e6
Component: engine
2015-07-27 09:22:01 -07:00
264f05bb5c
Merge pull request #14987 from vdemeester/fix-cli-import-docs
...
Add missing documentation to cli/import.md
Upstream-commit: a65f7acbbf5e543c9389ff0497eb966fefc00f1d
Component: engine
2015-07-27 09:19:57 -07:00
9ae5c1b997
Change restarting Docker daemon command in CentOS
...
Signed-off-by: bin liu <liubin0329@gmail.com >
Upstream-commit: aa5fc634f1d508eeb398977d7723f0255664ff78
Component: engine
2015-07-27 23:30:06 +08:00
7eed677896
*: s/direcotry/directory/g typo
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 7b4e6fc47b5b4b25f74f12419005098478e16ce7
Component: engine
2015-07-27 11:29:28 -04:00
b62ae3048a
api/client/build: typo in error
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 0e697ebe6eddc02b0fd2f35bf7bb4557b068be18
Component: engine
2015-07-27 11:01:26 -04:00
d3974d0227
/image - fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: b061572916c5bb959a24f8382b21429c9d81620c
Component: engine
2015-07-27 05:40:57 +00:00
736dba388d
Updated volume-driver plugin api docs
...
There was a mistake in the plugin_volume.md file regarding the /VolumeDriver.Remove call.
Added fix and a better explanation.
Signed-off-by: Bardia Keyoumarsi <b.keyoumarsi@gmail.com >
Upstream-commit: cc997a7f44f36e9f663afbb4af7e790586f1fc7a
Component: engine
2015-07-26 21:02:42 -07:00
74ff66528e
Merge pull request #14992 from runcom/remove-unused-funcs
...
Remove unused functions
Upstream-commit: 39999edcc9c966b07f9f1826e5beef767b725a2f
Component: engine
2015-07-26 18:36:37 -07:00
defa38f468
Merge pull request #14998 from jfrazelle/fix-systemd-debs
...
fix deb packaging systemd files
Upstream-commit: 23b0fdc896fe300c3a63810f604ef3966560720a
Component: engine
2015-07-26 17:49:19 -07:00
dec1a0e3c4
Check for nil before using HostConfig to adjustCpuShares
...
Fix #14915 . Add unit test for #14915 .
Thanks @runcom for the test case: when the client calls 1.18 api
version w/o hostconfig it results in a nil pointer dereference.
Signed-off-by: Stephen Rust <srust@blockbridge.com >
Upstream-commit: c358a4cd3597ac330674c9d93b6038e8f455c8f7
Component: engine
2015-07-26 20:33:04 -04:00
b39a60e323
much improved wording for manual network config setup on arch install docs by @moxiegirl
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com >
Upstream-commit: 26fa9b0d0d23700ba87aba7862fcf2baa5c26f1e
Component: engine
2015-07-26 19:11:27 +02:00
1e7a75140d
Add missing documentation to cli/import.md
...
PR #11907 added support for import using file (path), but it missed
the update of cli/import.md. This fixes that.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3101941120db54dde89933d76d3ea23c4bde0f7c
Component: engine
2015-07-26 18:39:42 +02:00
624235bebb
Fix typo
...
Signed-off-by: John Tims <john.k.tims@gmail.com >
Upstream-commit: 7b552c7a3782d2cb8270c5c3ca05d7b34b1ea407
Component: engine
2015-07-26 10:53:07 -04:00
0fccf757d0
Format times in inspect command with a template as RFC3339Nano
...
In 1.6.2 we were decoding inspect API response into interface{}.
time.Time fields were JSON encoded as RFC3339Nano in the response
and when decoded into interface{} they were just strings so the inspect
template treated them as just strings.
From 1.7 we are decoding into types.ContainerJSON and when the template
gets executed it now gets a time.Time and it's formatted as
2015-07-22 05:02:38.091530369 +0000 UTC.
This patch brings back the old behavior by typing time.Time fields
as string so they gets formatted as they were encoded in JSON -- RCF3339Nano
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: c9207bc0aa57745876a3422d2cbc290be7c53da8
Component: engine
2015-07-26 15:25:08 +02:00
0560ee0b45
Change of wording, rearrange section ordering
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com >
Upstream-commit: e1b57b2a87a763fc9fac5fbd59f64dcf1e541e7e
Component: engine
2015-07-26 13:27:35 +02:00
a41b93c9fb
Add arch install docs warning about systemd-network
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com >
Upstream-commit: 6bd15a68cf59043e05bd69fccbafcfed25d7c22e
Component: engine
2015-07-26 13:27:07 +02:00
29208c0bdb
Merge pull request #15004 from charleswhchan/patch-2
...
Update faq.md
Upstream-commit: 5297a25b4eabb0bd6b76a09ea8f63d3e18329243
Component: engine
2015-07-26 13:03:45 +02:00
10ca606a3c
Fix typo in JSON config example, in the CLI documetation
...
Signed-off-by: Michał Czeraszkiewicz <czerasz.hosting@gmail.com >
Upstream-commit: 09a9958e22640e1bcfec1c0c274a8c42ebc88b4a
Component: engine
2015-07-26 12:09:31 +02:00
6591e5b614
Update faq.md
...
Fix case for PostgreSQL.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: c6816dfc677a639361320274760d956eea200a29
Component: engine
2015-07-25 22:03:20 -07:00
f12a258842
Merge pull request #14996 from chrisseto/master
...
Fix go vet errors
Upstream-commit: b04dd6b7bc1fab74fd5854ae8aef3224fca9a178
Component: engine
2015-07-25 19:20:48 -07:00
eda33e0513
Fix docker-rm man page formatting
...
Signed-off-by: Denis Ollier <larchunix@users.noreply.github.com >
Upstream-commit: 93560496806c2f7fad273fe83d936c898bc7ab9e
Component: engine
2015-07-26 04:18:48 +02:00
a56deec7d3
Fix minor typo in Debian installation docs
...
Signed-off-by: Chander G <chandergovind@gmail.com >
Upstream-commit: ceeb22dc6e341da413926a5f972d54f5a3ca8715
Component: engine
2015-07-26 03:49:18 +05:30
3ff45b92dd
Merge pull request #14940 from coolljt0725/add_vxfs_magic_number
...
Add VxFS magic number, fixes #14847
Upstream-commit: 6b2b6cb3fc1a047e701b7884d98c89338144fb0a
Component: engine
2015-07-25 23:25:48 +02:00
b1920b91e3
fix deb packaging systemd files
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: a2ea8f2ad8b93c53253b9c86537dad95e14bd599
Component: engine
2015-07-25 14:04:39 -07:00
861b01ab9e
Fix go vet errors
...
Signed-off-by: Chris Seto <chriskseto@gmail.com >
Upstream-commit: 04f76b67c9f0a4559ef91e24873f51b81c81b957
Component: engine
2015-07-25 17:00:10 -04:00
869b9fcdec
Remove unused functions
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 0e69318b27e06d25e1d02736ab8c598547d8113a
Component: engine
2015-07-25 19:54:05 +02:00
f26f8b4a2b
Clarify error message when container name is already in use. Signed-off-by: Gustav Sinder <gustav.sinder@gmail.com>
...
Signed-off-by: gs11 <gustav.sinder@gmail.com >
Upstream-commit: 547d6c6656f161c3ad60c85ac0f19cf3d80571c7
Component: engine
2015-07-25 14:08:38 +02:00
ed5b93d380
Merge pull request #14720 from icecrime/14662_document_branches_tags
...
Document branches and tags
Upstream-commit: c051ed795347762fd53b3f9286c0f85402df5c42
Component: engine
2015-07-25 13:12:47 +02:00
7a78f67eef
Merge pull request #14941 from hqhq/hq_cli_remove_cleanup
...
Remove unnecessary container cleanup in integration-cli
Upstream-commit: 6b12d37cedc3c4c9287d1dcdb1fc831f46e49ee6
Component: engine
2015-07-24 20:38:15 -07:00
