4ec571c859
Merge pull request #13295 from aimxhaisse/13294-mflag-panic
...
Fix panic when using default-initialized FlagSet
Upstream-commit: fc4f3e5650493faed1e89bcf9a2a1a61c13dcd34
Component: engine
2015-05-18 11:27:12 -07:00
30a0089656
Merge pull request #13206 from draghuram/info_api_doc
...
Bring /info API doc in line with the actual response.
Upstream-commit: 93825056d8de651e5cbfff9122144e892e988144
Component: engine
2015-05-18 20:20:57 +02:00
ed62b6ffc8
Merge pull request #12804 from ankushagarwal/configuring-docker
...
Add CentOS/RHEL configuration to the config article
Upstream-commit: 8f8ee7d5c3277a3d16556ddcbae40e12f36a154a
Component: engine
2015-05-18 14:18:32 -04:00
b1c2bb01ee
Merge pull request #13280 from runcom/test-clean-from-inspect
...
Clean tests from not needed inspect call
Upstream-commit: aca4ae8c90dc4ae87dec720ed58a69bec6dabab6
Component: engine
2015-05-18 11:06:18 -07:00
ce9a1d34cc
Merge pull request #13306 from ahmetalpbalkan/logopts-context
...
Pass --log-opts map to logdrivers
Upstream-commit: cbc122e8a77493c521f23e1d9c1ba49d9108467e
Component: engine
2015-05-18 10:58:17 -07:00
61e72a4efb
Bring /info API doc in line with the actual response.
...
The fix handles versions 1.18 and 1.19.
Closes #13139 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 9c0608565c93a31d6885842376e82a19db5a7af4
Component: engine
2015-05-18 13:55:42 -04:00
bcf5956dfc
Pass -log-opts map to logdrivers
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 8b11592d699df669b529e34658ef2d870c8a75f8
Component: engine
2015-05-18 16:50:14 +00:00
ce99abf239
Merge pull request #13283 from Microsoft/10662-fixbaselinenewdriver
...
Windows: NewDriver() re-baseline parms
Upstream-commit: 19ae59f9109d08452e37bdd6252fe8a053dd2839
Component: engine
2015-05-18 10:56:06 -04:00
34e0bf8384
Fix panic when using default-initialized FlagSet
...
Closes #13294
Signed-off-by: Sebastien Rannou <mxs@sbrk.org >
Upstream-commit: e94bab8278ed5672d75a4c1121ef4a6c3febc5b9
Component: engine
2015-05-18 11:55:38 +02:00
d20fd1e820
Merge pull request #13284 from Microsoft/10662-compileconfigwindows
...
Windows: Simple import error on config_windows.go
Upstream-commit: 9c5635a2a08029d440aca6179fb5cd1ffcda6f0e
Component: engine
2015-05-17 08:59:00 -07:00
3c170ee3af
Merge pull request #13271 from Microsoft/10662-nounixsocket
...
Windows: No unix_socket.go
Upstream-commit: 692b7b911ede20eda92bf8b0b9cdd81b901de1fd
Component: engine
2015-05-16 21:34:15 -04:00
d2a1754a85
Merge pull request #13239 from Microsoft/10662-hack
...
Make which cross binary fails clearer
Upstream-commit: 48b4229cb4fae7665cb0194cad094e7801df4362
Component: engine
2015-05-17 01:09:36 +03:00
5e6717ae3b
Windows: Simple import error on config_windows.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: dfddfa6bb8560e8a75aa67abd3b34cf82e98311c
Component: engine
2015-05-16 12:18:55 -07:00
4e71899e7f
Windows: NewDriver() re-baseline parms
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 50b4079b5fdb9d966f49946c8db36c81648c1dee
Component: engine
2015-05-16 11:38:19 -07:00
525d9c3ed7
Merge pull request #13281 from mavenugo/plugin_typo
...
Fixing a Typo in plugins mime-type
Upstream-commit: a9172f572e13086859c652e2d581950e910d63d4
Component: engine
2015-05-16 19:52:57 +02:00
2a80100987
Clean tests from not needed inspect call
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: a268e36719e38b91a4ece84e3fdb742ed36feac3
Component: engine
2015-05-16 18:12:54 +02:00
c8d066f882
Merge pull request #13237 from ahmetalpbalkan/tag/event
...
Introduce daemon event 'tag' upon image tagging
Upstream-commit: b5e932a3bf1e9ba2682f0c3df2cc8fdf51f60229
Component: engine
2015-05-16 09:05:03 -07:00
c1aed4887a
Fixing a Typo in plugins mime-type
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 215a5ebdb6c36f63ff4d6294f2d1b29f87b6af40
Component: engine
2015-05-16 08:49:23 -07:00
9536d9d96e
Merge pull request #13273 from HuKeping/remove-deadcode
...
Cleanup dead code of integration-cli/utils.go
Upstream-commit: 42cfc95549728014811cc9aa2c5b07bdf5553a54
Component: engine
2015-05-16 14:03:42 +02:00
349c8c448e
Remove dead code of integration-cli/utils.go
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 35b4ed4d174105bacbd35e3d7a0e506ff2d697b8
Component: engine
2015-05-16 16:49:55 +08:00
07c8ebe4df
Merge pull request #13222 from calavera/plugins_infra
...
Remote plugins plumbing.
Upstream-commit: 115b11ae69d107e163034a1cfa9fd4d8e33ff00f
Component: engine
2015-05-15 16:37:55 -07:00
5e2fb0c11a
Windows: No unix_socket.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6c187b8b4b5110ff416e09e34a2a73304d01044d
Component: engine
2015-05-15 15:49:02 -07:00
377836e4b2
Allow to call back when a plugin is loaded.
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ba3bcf053749543a1643421d7fa5f680a49ee1a8
Component: engine
2015-05-15 13:50:44 -07:00
540e90ab62
Introduce daemon event 'tag' upon image tagging
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 1630ed97acc7bc3a08b57ce5acaa3d8e37a24694
Component: engine
2015-05-15 20:21:59 +00:00
7bcf0fc7df
Merge pull request #13232 from Microsoft/10662-zfs
...
Windows: No ZFS graphdriver
Upstream-commit: 27b77464d8ad883a28c0936a8b33affb6168647e
Component: engine
2015-05-15 11:51:48 -07:00
36f868037d
Merge pull request #13221 from duglin/ReenableDebug
...
add link between -D and --log-level=debug back in
Upstream-commit: 0db7365c66ddebc04c41d9baa7a99091d7f656b9
Component: engine
2015-05-15 11:45:44 -07:00
82bce49b9c
Merge pull request #13086 from shishir-a412ed/docker_root_execdriver
...
root dir for execdriver (/var/run/docker) should be configurable
Upstream-commit: b785e5091ff35b3fe74ad1d16f77fe611049ae44
Component: engine
2015-05-15 11:16:12 -07:00
581cc188ef
Merge pull request #13246 from unclejack/refactor_statscollector
...
daemon/stats_collector: refactor getSystemCpuUsage
Upstream-commit: 88127ce475ead0cf491ea64a0b4ec4074a25b173
Component: engine
2015-05-15 11:06:47 -07:00
dbb89bcdab
Remote plugins plumbing.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 839d64ffb157ba170fb644a42f5096f334b7cc48
Component: engine
2015-05-15 11:04:58 -07:00
cb0887401b
Merge pull request #13236 from vieux/revert_time_change
...
Revert "Fix inconsistent date formats in API"
Upstream-commit: 520955b1cfaa65dbb4609c414c8d913327ee4520
Component: engine
2015-05-15 10:32:03 -07:00
1c502870b7
Make which cross binary fails clearer
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 0bdeef94c7268e0816528423898b1daefe195d89
Component: engine
2015-05-15 09:25:13 -07:00
eec633b1b4
Merge pull request #13251 from cpuguy83/13233_fix_log_follow_goroutine_check
...
Extend sleep/timeout for ngoroutine check
Upstream-commit: 5d2ef30a389239d6f5a3a6d1c43c9567a07569ac
Component: engine
2015-05-15 08:57:25 -07:00
3d94b2d4e8
Merge pull request #13220 from Microsoft/10662-sysinfo
...
Windows: Refactor sysinfo for compilation
Upstream-commit: 248e5a4c8351e7dcf0db73808e3581d73e2ed135
Component: engine
2015-05-15 10:53:55 -04:00
b4723c0fb7
Merge pull request #13243 from coolljt0725/remove_redundant_log
...
Cleanup:Remove redundant log in pkg/pidfile/pidfile.go
Upstream-commit: 2c8eba14df509a2ccb74afa2f6c6ab02cb707727
Component: engine
2015-05-15 10:13:19 -04:00
74818dcd57
Extend sleep/timeout for ngoroutine check
...
In cases where this is failing it's ok to have the test take extra time,
but we don't want it to fail because of some race/performance
differences between systems.
So make the timeout go to 30s and double the sleep time in between
checks so it's not pounding the daemon quite so fast.
Originally I couldn't make this test fail (pre-change), but changed
graphdrivers and saw a failure pretty quickly.
This change seems to smooth that out.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f207322c0a017adcce2da04473626f040e08267c
Component: engine
2015-05-15 09:54:43 -04:00
7f98a41593
root dir for execdriver (/var/run/docker) should be configurable
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 8b2c6cb0729eadb09d688241e0f5debf1d5ccb0b
Component: engine
2015-05-15 09:30:36 -04:00
091bd3b25b
daemon/stats_collector: refactor getSystemCpuUsage
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 25f776451e88a52c2677d5c56383f03a1a4c539f
Component: engine
2015-05-15 12:22:50 +03:00
f9e7dda027
Remove redundant log in pkg/pidfile/pidfile.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 60e5c273cfde9fac1ac09ebcc666977232115f65
Component: engine
2015-05-15 15:26:00 +08:00
56ea157723
Revert "Fix inconsistent date formats in API"
...
This reverts commit 945fc9d882324ac87505e34bb74e6ebe30be1309.
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: b261ce5fb007371892bc40a5853337db09a1c8ae
Component: engine
2015-05-14 17:31:45 -07:00
5edd0d62d2
Merge pull request #13188 from ahmetalpbalkan/inputs-standard-rfc3339
...
Parse input timestamps with standard RFC3339
Upstream-commit: e4855eebf229fa1ebddf254a6c32804425ae8c56
Component: engine
2015-05-14 16:49:01 -07:00
4a6cf355cf
Windows: No ZFS graphdriver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 35cdcbb323bc76a0874962c08de627221bf4880d
Component: engine
2015-05-14 15:57:45 -07:00
b0f3ea455f
Merge pull request #12770 from Microsoft/10662-daemonconfigrefactor
...
Windows: Start of daemon config refactor
Upstream-commit: c5240d79e391a7ce499fd59abab69f5504615f21
Component: engine
2015-05-14 14:55:22 -07:00
af04c73a3c
Merge pull request #13223 from Microsoft/10662-loggers
...
Windows: Factor out syslog and journald
Upstream-commit: a4592467e7e8c4a045ddc0e0d2e0efd5ed376813
Component: engine
2015-05-14 16:26:43 -04:00
6d5c4d91dd
Merge pull request #13196 from crosbymichael/update-libocntainer-may13
...
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
Upstream-commit: b2ad9314a2e9bce481275c8d3c08e5e1b9f04523
Component: engine
2015-05-14 10:49:25 -07:00
38fd09288b
Windows: Factor out syslog and journald
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 655a58e27bfcfd2494bb5d46f95cb49d655ad17a
Component: engine
2015-05-14 10:34:09 -07:00
2095b80959
add link between -D and --log-level=debug back in
...
Due to popular demand :-)
See #11965
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: a85ca8b7c40f05f2b6471cc30fb8d5271605c1d1
Component: engine
2015-05-14 10:29:49 -07:00
fb9d7fcfdc
Windows: Refactor sysinfo for compilation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b7ee717a10db00858c441f78f2f1a47e2a9493a1
Component: engine
2015-05-14 09:44:51 -07:00
8de199cc5a
Merge pull request #13087 from duglin/FixNatTest
...
Fix random errors in DockerSuite.TestNetworkNat
Upstream-commit: fe6f77df2ca6c6ee463b5eba88b428ed8b99281b
Component: engine
2015-05-14 08:35:27 -07:00
59274bcf1f
Merge pull request #13202 from duglin/ImportFix
...
Fix a regression in `docker import` on error from URL
Upstream-commit: ac81cd1fc36c57b0275992f5e6586728c41dc068
Component: engine
2015-05-14 10:36:50 -04:00
cf085c0892
Merge pull request #13208 from ahmetalpbalkan/nit
...
Remove out of date comment
Upstream-commit: 1c5a4728e1dec9f154d558e949218e728d464c4e
Component: engine
2015-05-14 06:59:21 -07:00
