Alexander Morozov
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
David Calavera
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
Alexander Morozov
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
David Calavera
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
Michael Crosby
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
John Howard
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
Alexander Morozov
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
Brian Goff
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
Brian Goff
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
Brian Goff
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
Shishir Mahajan
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
Lei Jitang
55843a6210
Fix incorrect document storage-opt
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 0204ecdf707bdbb3caa76548e576f4ff0706fc46
Component: engine
2015-05-15 19:13:07 +08:00
unclejack
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
Lei Jitang
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
Qiang Huang
2d55f07e06
kr/pty: vendor upstream 5cf931ef8f
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 478d86a5f5046165c0e34612eb5983630830e93f
Component: engine
2015-05-15 15:22:16 +08:00
Qiang Huang
9bd131bf91
Enhance check-config.sh
...
Currently check-config.sh just said enable or missing, when I used
a fresh kernel, made check-config.sh happy, still can't start
container. It take me days debuging kernel and Docker and finally
found it's because I enabled some CONFIGs as modules and never
loaded these modules.
So I think it's necessary to let check-config.sh told users which
configs are enabled as modules.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 6e19912df9ea764c53b5607533eb25315527c3c4
Component: engine
2015-05-15 10:20:31 +08:00
Victor Vieux
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
David Calavera
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
John Howard
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
Tibor Vass
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
Brian Goff
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
Alexander Morozov
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
John Howard
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
Doug Davis
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
John Howard
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
vagrant
a587ee906f
fix to gccgo compilation error
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: d2a2c974d9d0862ddd9974c861c080159a53cd4b
Component: engine
2015-05-14 16:28:23 +00:00
Alexander Morozov
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
Brian Goff
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
Doug Davis
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
Doug Davis
703705b500
Fix a regression in docker import on error from URL
...
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake. This removes the ":" from "... err := " which fixes it.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 3f4926e49b5f6df00ca09328e990729e00cb1a92
Component: engine
2015-05-14 06:56:52 -07:00
Günter Zöchbauer
729c010981
Add bwu_docker to the list.
...
Signed-off-by: Guenter Zoechbauer <guenter@gzoechbauer.com >
Upstream-commit: ef956253d844589c139d52dec93948744a139491
Component: engine
2015-05-14 15:27:51 +02:00
Ahmet Alp Balkan
c16c9cc586
Parse input timestamps with standard RFC3339
...
Fix for #13175 .
This change allows user-input timestamps (e.g. to `docker events
--since/--until` or `docker logs --since` to be parsed using
standard RFC3339Nano layout in Go instead of the layout that parses
all timestamps into fixed-length strings (currently buggy).
User inputs need not to be complying to the internal format
(`RFC3339NanoFixed`) anyway.
Added test case for `events --since/--until` with all possible
timestamp input formats.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 999f464feb5b78e8ecc97625e70f3b1796d0a758
Component: engine
2015-05-14 07:44:42 +00:00
Ahmet Alp Balkan
b916b32974
Remove out of date comment
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 9448d3627bd655873c3c2e3db38f62d8c54d8349
Component: engine
2015-05-14 07:37:31 +00:00
Ankush Agarwal
f38b9f3ec2
Update Configuring and running Docker article
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 9bfe6f0d24a9eb85c7689bc696487d9f016a67d4
Component: engine
2015-05-14 07:45:20 +02:00
Sankar சங்கர்
781675c7a9
Copied info about google groups, IRC, etc. to README.md from CONTRIBUTORS.md
...
Signed-off-by: Sankar சங்கர் <sankar.curiosity@gmail.com >
Upstream-commit: cb4d47ddb308b799e622f871e6e866557643c522
Component: engine
2015-05-14 11:12:20 +05:30
Sebastiaan van Stijn
34f1d71bf5
Merge pull request #11706 from HuKeping/time
...
Fix inconsistent date formats in API
Upstream-commit: 1d57642906ced778e826f655aed5a0eaab30fe71
Component: engine
2015-05-13 20:23:19 -07:00
Hu Keping
2e9a18b752
Fix inconsistent date formats in API
...
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history
display the Created Time as UNIX format which doesn't make sense.
These should be more readable as CLI command `docker inspect` shows.
Due to the case that an older client with a newer version daemon, we
need the version check for now.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 945fc9d882324ac87505e34bb74e6ebe30be1309
Component: engine
2015-05-14 18:58:55 +08:00
Chen Hanxiao
43bc848f37
gitignore: add *.rej
...
Ignore noise from unsuccessful patch operation.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: 3957cc8022c76fbe60d018fd173cb0cb35beadba
Component: engine
2015-05-13 22:10:26 -04:00
Sebastiaan van Stijn
ab675e423e
Merge pull request #12667 from ibuildthecloud/host-uts
...
Add --uts=host to allow sharing the UTS namespace
Upstream-commit: ed257420025772acc38c51b0f018de3ee5564d0f
Component: engine
2015-05-13 18:30:32 -07:00
Darren Shepherd
dc9bbf77b5
Add --uts=host to allow sharing the UTS namespace
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: f2e5207fc989288ad136d48222df8e7754eb0e9b
Component: engine
2015-05-13 17:56:32 -07:00
Brian Goff
19c710821b
Merge pull request #13201 from Microsoft/10662-fixdebugtrap
...
Fix package on debugtrap_unsupported.go
Upstream-commit: f2bc54f7962e415d9aaf77ac57a6dca1ce08e7bd
Component: engine
2015-05-13 20:44:13 -04:00
Brian Goff
2fa30dbf79
Merge pull request #13112 from hqhq/hq_fix_oonkilldisable
...
Fix oom kill disable issue
Upstream-commit: feb0fa8dbf9d14894d65943325c9e64a19cd2ae2
Component: engine
2015-05-13 20:03:33 -04:00
John Howard
2d29921e20
Fix package on debugtrap_unsupported.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1e78eec8261d93bcf3eeb7aad123032d81fcbb83
Component: engine
2015-05-13 16:38:59 -07:00
Antonio Murdaca
397dc5614b
Merge pull request #13146 from rajdeepd/dry-run-test-1
...
Modified Test Case to include check for Memory and MemorySwap
Upstream-commit: b37abf2528c26251e0a4ea30dcfd025d2151deb0
Component: engine
2015-05-14 01:10:35 +02:00
Alexander Morozov
cd070e7fe0
Merge pull request #13154 from coolljt0725/typo_remove_redundant_dot
...
Minor typo: remove redundant dot in error message in runconfig/parse.go
Upstream-commit: 64ea54c0ed3f0daff40402259e3a2566a51cd4fe
Component: engine
2015-05-13 15:24:01 -07:00
Michael Crosby
2df1795660
Update test for /sys mounting
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 677d76cd4aadf7514a3ba4e6761880fc3817f573
Component: engine
2015-05-13 15:02:53 -07:00
moxiegirl
20a74613ee
Merge pull request #13193 from moxiegirl/dhe-commercial-release
...
adding release note for 1.6.2
Upstream-commit: 32f8a40398f83138af61c2825f2a5fe5e519deb3
Component: engine
2015-05-13 14:51:50 -07:00
Alexander Morozov
b3410f7752
Merge pull request #13194 from crosbymichael/merge_release_v1.6.2
...
Merge release 1.6.2
Upstream-commit: 31c81122855cb984057d7b0c9865018e2e4b7e09
Component: engine
2015-05-13 14:01:40 -07:00
Michael Crosby
eaedb9b85a
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 87c35d0e0af930d1c7ac03f852287348f7f9d240
Component: engine
2015-05-13 13:55:26 -07:00
Mary Anthony
0be8a8c7ac
adding release note for 1.6.2
...
Signed-off-by: Mary Anthony <mary@docker.com >
ugh, cut n paste
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 6c17b4818d207ea610fc6937c270a23881f79708
Component: engine
2015-05-13 13:54:30 -07:00
Alexander Morozov
David Calavera
Michael Crosby
John Howard
Brian Goff
Shishir Mahajan
Lei Jitang
unclejack
Qiang Huang
Victor Vieux
Tibor Vass
Doug Davis
vagrant
Doug Davis
Günter Zöchbauer
Ahmet Alp Balkan
Ankush Agarwal
Sankar சங்கர்
Sebastiaan van Stijn
Hu Keping
Chen Hanxiao
Darren Shepherd
Antonio Murdaca
moxiegirl