add0a8eb5b
Allow duration strings as --since/--until
...
Fixes #13107 . This change enables Go duration strings
computed relative to the client machine’s time to be used
as input parameters to `docker events --since/--until`
and `docker logs --since` arguments.
Added unit tests for pkg/timeutils.GetTimestamp as well.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 4e3b21f99e7fb7fac0075be2e7190d5f07c9ee66
Component: engine
2015-06-02 21:02:47 +00: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
f72477cc8d
Bump to version 1.6.2
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Conflicts:
VERSION
Upstream-commit: cec64ebef849dade38c6ac29fc077f30f9d872d0
Component: engine
2015-05-13 13:51:39 -07:00
7a2a7a58a0
Modified Test Case to include check for Memory and MemorySwap
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
Upstream-commit: 1eea2c589da4a4a3f5bfb83f6acf54af83ff4533
Component: engine
2015-05-13 13:39:07 -07:00
dff7942f86
Merge pull request #13190 from unclejack/precompile_regexp
...
Precompile regexp
Upstream-commit: 877461bc2031e104b1f537d08436e36d4c41b9a5
Component: engine
2015-05-13 13:00:14 -07:00
b9cea2b317
Merge pull request #13155 from coolljt0725/fix_validate_tag_name
...
Fix validate tag name. Fix #13149
Upstream-commit: 3da0013ac4c12cacc36dfb8746ed6403e358256f
Component: engine
2015-05-13 12:03:22 -07:00
2f381e17ae
Merge pull request #13192 from tianon/fix-bad-vendor.sh-rebase
...
Fix mangled hack/vendor.sh rebase
Upstream-commit: c46c8f4e4082552dd9ea003aaf71fbf52ba983a1
Component: engine
2015-05-13 12:02:07 -07:00
1d7b0aaa0c
Fix mangled hack/vendor.sh rebase
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: c2d618781183817e74245325add5bddebcb810d2
Component: engine
2015-05-13 12:52:59 -06:00
5de033afb0
pkg/stringid: precompile regexp
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: cb08c1173fae541742af3c8329e00904edef48df
Component: engine
2015-05-13 21:48:48 +03:00
3fb26e927f
image: precompile regexp
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 8f57e7d2ef82d39e2c914b799e98ed6243b9b1d0
Component: engine
2015-05-13 21:47:43 +03:00
c6760c3f88
Merge pull request #13174 from ahmetalpbalkan/TestLogsSince
...
integ-cli: Fix race in TestLogsSince
Upstream-commit: 1b678f86b37e836e6f6cf1f58f18fde36672bfce
Component: engine
2015-05-13 11:35:17 -07:00
28e112fb4d
Merge pull request #13183 from runcom/fix-typo-tests-grouping
...
Fix typo to run tests grouped by RunUnprivileged
Upstream-commit: ebe9a854869d1b5470e67e3657a62432e36680a3
Component: engine
2015-05-13 11:33:14 -07:00
076e804d9c
Merge pull request #12226 from ahmetalpbalkan/logdrivers/refactoring
...
daemon: Logging drivers architectural refactoring
Upstream-commit: 951c2ef2c94b10ed49f18ca38353c6507c5231fa
Component: engine
2015-05-13 11:00:50 -07:00
a7920a7e08
Merge pull request #13180 from unclejack/fix_test_name
...
integcli: change Dettach to Detach
Upstream-commit: 8eac7d0779626d3bc1f2907a4497720616f41717
Component: engine
2015-05-13 09:07:18 -04:00
0ea0631fe7
Fix typo to run tests grouped by RunUnprivileged
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: a36f6a140bb7987c18a8177115cbc315672f9e53
Component: engine
2015-05-13 14:24:54 +02:00
5be78509f7
integcli: change Dettach to Detach
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: fdec5197f145a1aa18329337746f6a94389da0a1
Component: engine
2015-05-13 12:49:19 +03:00
9babc5a64f
Fix invalid tag name
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: e00cfbb6f2b953301bfcd7270e9bdfde1a2d17c7
Component: engine
2015-05-13 14:28:52 +08:00
5bef2d9b74
Merge pull request #13169 from jfrazelle/cleanup-integration
...
cleanup test-integration
Upstream-commit: 3401ee13f838d7d579f6165cc4801ce419f929ff
Component: engine
2015-05-13 06:34:30 +02:00
af27a9480d
Merge pull request #13106 from duglin/HumanizeCliErrors
...
Use stderr instead of logrus for CLI error messages
Upstream-commit: 56847ec4d4c24535bd8f4763e895f609eec9e8cf
Component: engine
2015-05-13 05:23:56 +02:00
4627e314ec
Minor typo: remove redundant dot in error message in runconfig/parse.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c6dad07b1bc585f98439dd87deadec062188cbb5
Component: engine
2015-05-13 11:04:07 +08:00
276b0e4ce0
integ-cli: Fix race in TestLogsSince
...
TestLogsSince used to rely on time synchronization and precision of
the timestamps. This change provides a less flaky alternative.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 2fe2f7a1864068e7d268833bb40536064f69b8aa
Component: engine
2015-05-13 02:59:11 +00:00
d58b604612
Merge pull request #11965 from duglin/DEBUG
...
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
Upstream-commit: 36d995a291c672205d1e8f93f19fb07de253c3d7
Component: engine
2015-05-12 18:24:04 -07:00
71c213ec0b
Merge pull request #13131 from Microsoft/10662-loadonwindows
...
Windows: Build load.go
Upstream-commit: 3985f1781228d6060228d83e559f14e6d7cc9d7c
Component: engine
2015-05-12 18:04:33 -07:00
9c4dfe4f27
Merge pull request #13166 from runcom/small-streamformatter-refactor
...
Refactor pkg/stremformatter - custom constructors
Upstream-commit: ec4baad9549448f409af5ec98fa0737b94512824
Component: engine
2015-05-12 20:28:18 -04:00
2e83148ffd
Use stderr instead of logrus for CLI error messages
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0024935f641ab596732f9162d3eab795bbc2ae06
Component: engine
2015-05-12 17:22:41 -07:00
c55bc07730
Merge pull request #13099 from Microsoft/10662-pkgparsers
...
Windows: Implement parsers:kernel+os
Upstream-commit: df89008f0ce17a1ffdbde6a59ef0eade0e885ed8
Component: engine
2015-05-12 16:07:43 -07:00
