3ec8bc1fa3
Cleanup: Merge adjustCPUShares to adoptContainerSettings
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: e0af23dc18eac17633ab1f2541f26b56c303a18c
Component: engine
2015-08-06 08:15:14 +08:00
b5f711f36e
Merge pull request #15119 from xnox/sdnotify
...
systemd: set service type to notify.
Upstream-commit: efe4f0dfa92b6de558f3b46adc6e12e777a5ca30
Component: engine
2015-08-05 17:42:58 -07:00
a9c377d5a8
Merge pull request #15334 from Mashimiao/change-name-check-for-image-delete
...
image_delete: move name check first
Upstream-commit: 044c4e00a0688f710d3b37bfb54d711f6955068d
Component: engine
2015-08-06 02:07:34 +02:00
9d9a4fd0c0
Merge pull request #15252 from coolljt0725/14765_enable_golint_3
...
Enable golint in pkg/archive
Upstream-commit: 8534090476b6eae66f1eca81e8bc0e0c61ed7197
Component: engine
2015-08-05 19:27:48 -04:00
43b0434b22
Merge pull request #15345 from calavera/fix_ps_format_error
...
Fail fail when the ps format template is invalid.
Upstream-commit: d93eca2250bd89ca57e29f25268c1774eb34875f
Component: engine
2015-08-05 19:19:33 -04:00
245054e124
Merge pull request #15001 from fmoliveira/master
...
Adding support for elementary OS distro in install script.
Upstream-commit: a8e67849b98e14ac11e2114ba477e239a617be05
Component: engine
2015-08-05 16:14:47 -07:00
c46f64c6a9
Merge pull request #15346 from Microsoft/minortypo
...
Minor typo in test-and-docs.md
Upstream-commit: 565535073f4ad879bbd15b0af81a70c6e6379501
Component: engine
2015-08-05 22:27:18 +02:00
ef703e5bbc
Minor typo in test-and-docs.md
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b5eea8f33b20bf480bc7c496b12818483dffb96b
Component: engine
2015-08-05 13:22:39 -07:00
82b6f1602c
Fail fail when the ps format template is invalid.
...
Fixes error continuing execution when the parsing fails.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3d3db0d4af6cf483299a152133f19f9df760dc11
Component: engine
2015-08-05 13:22:24 -07:00
8d6881c74a
Merge pull request #15336 from Microsoft/fixwindowsci
...
Windows: Fix for CI
Upstream-commit: aec46ac0b20ea0c912148fcda12207db1bf93c1b
Component: engine
2015-08-05 13:11:59 -07:00
9416fd6ce9
Windows: Workaround for CI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ac120567e8015a6a98f0aa7ac71f3ce2d5f36031
Component: engine
2015-08-05 11:20:30 -07:00
9e664dc6de
image_delete: move name check first
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: cb2def9f906e0622fef9c3036b842b5decc01cf4
Component: engine
2015-08-06 00:27:45 +08:00
acc8db8b85
Merge pull request #15305 from vdemeester/contribution-docs-updates
...
Update some contributions documentations
Upstream-commit: 6206cbe19350d8df7199573c79c981af5fc72b1d
Component: engine
2015-08-05 08:46:53 -07:00
732e0d1516
Merge pull request #15318 from Microsoft/10662-fixmasteragain
...
Windows: Fix docker/master daemon compile again
Upstream-commit: a15b676ee1de514628aee59fa93ff2ba541c9236
Component: engine
2015-08-05 08:32:12 -04:00
5dd4ca1927
Windows: Fix docker/master daemon compile again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 67e670b79f1ed372b62058ebadd5821fa85cd737
Component: engine
2015-08-04 19:32:05 -07:00
aa73b79fe2
Merge pull request #14921 from aaronlehmann/int64
...
Fix uses of "int" where "int64" should be used instead
Upstream-commit: 7374852be9def787921aea2ca831771982badecf
Component: engine
2015-08-04 19:16:13 -07:00
9f7d6bbf8a
Merge pull request #15241 from vdemeester/api-test-coverage
...
Add more unit tests (coverage) to package api
Upstream-commit: b985dca5783f8e5bc067b9f79d8a7f53f71536e6
Component: engine
2015-08-04 18:41:35 -07:00
a1cfc26eb3
Merge pull request #15269 from brahmaroutu/lint_daemon_graphdriver_zfs
...
daemon/graphdriver/zfs fix lint errrors/warnings
Upstream-commit: 2c3cd949c8db8f8bacccbd79c3f5650c8b32cabc
Component: engine
2015-08-04 18:41:02 -07:00
ff1d8010b3
Merge pull request #15302 from LK4D4/update_libcontainer
...
Update runc to v0.0.3
Upstream-commit: 7b077c16d6f657309b48b05b941d3b09a705c827
Component: engine
2015-08-04 18:40:32 -07:00
57bb897892
Adding support to forked distributions in installer script.
...
Signed-off-by: Filipe Oliveira <contato@fmoliveira.com.br >
Upstream-commit: f618de15436941c91cc1b82a56518a4e338c7b76
Component: engine
2015-08-04 21:33:48 -03:00
db1c12e1e7
Merge pull request #15304 from jfrazelle/only-sign-files-changes-within-last-2-hours
...
only sign the files that were changed in the last 2 hours
Upstream-commit: 58121c59ffb3cf4795225dc1f71f3ccb1f5cf7c9
Component: engine
2015-08-04 14:16:20 -07:00
47e71fa895
Merge pull request #15303 from Microsoft/10662-fixdaemonbuild
...
Windows: Daemon compile was broken
Upstream-commit: 63940145a465ff76b856648b570a367e5c614a54
Component: engine
2015-08-04 16:48:11 -04:00
40a95ce695
only sign the files that were changed in the last 2 hours
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: efd47654dd923577b6694f8ef3dddb3ac3b51816
Component: engine
2015-08-04 13:16:57 -07:00
5f1a727f3d
Merge pull request #15301 from jfrazelle/fix-systemd-docs
...
update systemd article to reference dropin file
Upstream-commit: d4d3504122211812401456e69cf4852365977a32
Component: engine
2015-08-04 22:12:36 +02:00
bc9b99ad99
Update some contributions documentations
...
- Add a golint entry to coding-style.md
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b30492002172a525513a2c411ebae22149dd4476
Component: engine
2015-08-04 22:04:11 +02:00
e94fbdc264
Windows: Daemon compile was broken
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: fe8cfc5b39ffca9f15bc5f005164aa31754ee991
Component: engine
2015-08-04 12:42:41 -07:00
f031716448
Merge pull request #14840 from HuKeping/golint-pkg-sysinfo
...
Fix golint warning on pkg/sysinfo
Upstream-commit: 23dab01ed245c5a5132a2deb7ea26c0a984ec198
Component: engine
2015-08-04 20:57:39 +02:00
cc6eee4f4a
daemon/graphdriver/zfs fix lint errrors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: e27c904b99e49e82f8d527e78161118d2b800523
Component: engine
2015-08-04 18:30:55 +00:00
5df863af84
update systemd article to reference dropin file
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 35e7a7c3e2f0e7329ef666b0e5078b39626befd2
Component: engine
2015-08-04 11:03:43 -07:00
4b1fbc6af4
Add more unit tests (thus coverage) to pkg api
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f7e43d45b396d6c1f7d8f3f0606917501f466015
Component: engine
2015-08-04 19:51:02 +02:00
772d6ad7e5
Update runc to v0.0.3
...
This fixes criu behavior with mounted cgroups.
It includes also update of go-systemd dependecy.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a4ddf0e3624c9e05172d1ad7841f87720a4c9c87
Component: engine
2015-08-04 10:47:59 -07:00
2d50f13b4a
Merge pull request #15300 from l0rd/test-and-docs-fix
...
Removed `docs-test` from Makefile rules list
Upstream-commit: 0f491411500eeb18a6be2416fecfcd200e02db08
Component: engine
2015-08-04 19:41:48 +02:00
3b294e8970
Merge pull request #15260 from albers/completion-config
...
Add `--config` to bash completion
Upstream-commit: c4b9884ab511801d446e5f63bcb1604d9bc775c2
Component: engine
2015-08-04 10:14:15 -07:00
dd5a03a657
Merge pull request #15291 from duglin/FixInspectExecId
...
Another try to fix InspectExecID
Upstream-commit: 2c6fa8375ba1b124abf46d8ea6fd874146b8db60
Component: engine
2015-08-04 10:13:42 -07:00
b6bee43e0c
Another try to fix InspectExecID
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: fe6a7c8e57c1cf7cf7cbc501fa2006c8eaf412f1
Component: engine
2015-08-04 09:21:41 -07:00
5866811776
Merge pull request #15297 from lerignoux/15296-updating-docs-README-new-md-file
...
Removing deprecated notice to update mkdocs.yml in docs README
Upstream-commit: c5e0ea02f77b2249a5a452ae6a37511ef20e15af
Component: engine
2015-08-04 09:04:21 -07:00
ce6d511a95
Removed docs-test from Makefile rules list
...
Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com >
Upstream-commit: 5237670b5b9b1953a93e0f5ab83a0140ef037186
Component: engine
2015-08-04 15:57:42 +00:00
ea3fc05262
Merge pull request #15259 from sallyom/manFixes
...
make man/docker.1.md consistent with docker --help
Upstream-commit: be07c53d2d2d5aafde85068ed98a8e4b202e8978
Component: engine
2015-08-04 08:34:52 -07:00
5d5181b3aa
Removing deprecated notice to update mkdocs.yml in docs README
...
Signed-off-by: Laurent Erignoux <lerignoux@gmail.com >
Upstream-commit: ac1794d3e299cb3b69edfd4241f22501b7282320
Component: engine
2015-08-04 15:15:46 +02:00
6d8b655cbf
Merge pull request #15236 from charleswhchan/patch-1
...
Fix #15212 : Add "Label" key to output of /containers/json
Upstream-commit: bc1209425117b6e1e80b3dba0259a24ff87835dc
Component: engine
2015-08-04 21:48:39 +10:00
c2c7833999
Merge pull request #15278 from campoy/14558-break-long-command
...
Break long command to avoid cropping
Upstream-commit: c26c1eb8bae50db90b8bbb58a6ff46e9bbf58ea8
Component: engine
2015-08-04 08:27:55 +02:00
3ba45e7906
Enable golint in pkg/arcive
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: ba332b7d12fba16e8c604728a44986886eeb07d6
Component: engine
2015-08-04 09:52:54 +08:00
fcc2624be6
Break long command to avoid cropping
...
Fixes docker/docker#14558
Signed-off-by: Francesc Campoy <campoy@google.com >
Upstream-commit: 16b5b6e49f3ee1a327216ec9b6fe4b857f3ea7a2
Component: engine
2015-08-03 18:36:32 -07:00
e2641596d8
Fix #15212 : Add "Labels" key to output of /containers/json
...
Applied retroactively from API v1.18 - v1.21.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: b245bcd458492c9b348b790a9422dd7478f9af83
Component: engine
2015-08-03 18:11:33 -07:00
86c6dbe4c7
Merge pull request #15277 from calavera/check_apparmor_docker_contrib
...
Include apparmor/docker only when it exists.
Upstream-commit: dff25c9e46562c60fefe1133dac8d846126fd61f
Component: engine
2015-08-03 17:36:23 -07:00
78c95b1e80
Include apparmor/docker only when it exists.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 408cffac942f7c3efa3a51bdcfac694298ae0c17
Component: engine
2015-08-03 17:34:04 -07:00
d72b66b9b4
Merge pull request #15276 from aboch/24
...
Fix preallocated bridge networks
Upstream-commit: d7c2fe0f20f9310dd0f5382d374e54738f65bc4b
Component: engine
2015-08-03 17:21:03 -07:00
3e038be591
Fix preallocated bridge networks
...
- Because of a bug, all the statically preallocated
bridge networks have /24 as network mask.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: dab0447ae0c6d1355cf4708743973121cd55462a
Component: engine
2015-08-03 16:37:01 -07:00
3700154a99
Merge pull request #15114 from hqhq/hq_exedriver_win_lint
...
Fix golint warnings for daemon/execdriver/windows
Upstream-commit: ff3adb135deef895e4726a720b8f72d631eb0177
Component: engine
2015-08-03 16:28:47 -07:00
ee0574ea56
Merge pull request #15261 from LK4D4/fix_fluentd_vendor
...
Fix vendoring for fluent-logger-golang
Upstream-commit: 8d3bc4b98c00d6ec41d99e3d4b73a8d48726c8ba
Component: engine
2015-08-03 16:13:05 -07:00
