655a58e27b
Windows: Factor out syslog and journald
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-14 10:34:09 -07:00
fe6f77df2c
Merge pull request #13087 from duglin/FixNatTest
...
Fix random errors in DockerSuite.TestNetworkNat
2015-05-14 08:35:27 -07:00
ac81cd1fc3
Merge pull request #13202 from duglin/ImportFix
...
Fix a regression in `docker import` on error from URL
2015-05-14 10:36:50 -04:00
1c5a4728e1
Merge pull request #13208 from ahmetalpbalkan/nit
...
Remove out of date comment
2015-05-14 06:59:21 -07:00
3f4926e49b
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 >
2015-05-14 06:56:52 -07:00
9448d3627b
Remove out of date comment
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-05-14 07:37:31 +00:00
1d57642906
Merge pull request #11706 from HuKeping/time
...
Fix inconsistent date formats in API
2015-05-13 20:23:19 -07:00
945fc9d882
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 >
2015-05-14 18:58:55 +08:00
ed25742002
Merge pull request #12667 from ibuildthecloud/host-uts
...
Add --uts=host to allow sharing the UTS namespace
2015-05-13 18:30:32 -07:00
f2e5207fc9
Add --uts=host to allow sharing the UTS namespace
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-05-13 17:56:32 -07:00
f2bc54f796
Merge pull request #13201 from Microsoft/10662-fixdebugtrap
...
Fix package on debugtrap_unsupported.go
2015-05-13 20:44:13 -04:00
feb0fa8dbf
Merge pull request #13112 from hqhq/hq_fix_oonkilldisable
...
Fix oom kill disable issue
2015-05-13 20:03:33 -04:00
1e78eec826
Fix package on debugtrap_unsupported.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-13 16:38:59 -07:00
b37abf2528
Merge pull request #13146 from rajdeepd/dry-run-test-1
...
Modified Test Case to include check for Memory and MemorySwap
2015-05-14 01:10:35 +02:00
64ea54c0ed
Merge pull request #13154 from coolljt0725/typo_remove_redundant_dot
...
Minor typo: remove redundant dot in error message in runconfig/parse.go
2015-05-13 15:24:01 -07:00
32f8a40398
Merge pull request #13193 from moxiegirl/dhe-commercial-release
...
adding release note for 1.6.2
2015-05-13 14:51:50 -07:00
31c8112285
Merge pull request #13194 from crosbymichael/merge_release_v1.6.2
...
Merge release 1.6.2
2015-05-13 14:01:40 -07:00
6c17b4818d
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 >
2015-05-13 13:54:30 -07:00
cec64ebef8
Bump to version 1.6.2
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Conflicts:
VERSION
2015-05-13 13:51:39 -07:00
1eea2c589d
Modified Test Case to include check for Memory and MemorySwap
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
2015-05-13 13:39:07 -07:00
877461bc20
Merge pull request #13190 from unclejack/precompile_regexp
...
Precompile regexp
2015-05-13 13:00:14 -07:00
3da0013ac4
Merge pull request #13155 from coolljt0725/fix_validate_tag_name
...
Fix validate tag name. Fix #13149
2015-05-13 12:03:22 -07:00
c46c8f4e40
Merge pull request #13192 from tianon/fix-bad-vendor.sh-rebase
...
Fix mangled hack/vendor.sh rebase
2015-05-13 12:02:07 -07:00
c2d6187811
Fix mangled hack/vendor.sh rebase
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-13 12:52:59 -06:00
cb08c1173f
pkg/stringid: precompile regexp
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-05-13 21:48:48 +03:00
8f57e7d2ef
image: precompile regexp
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-05-13 21:47:43 +03:00
1b678f86b3
Merge pull request #13174 from ahmetalpbalkan/TestLogsSince
...
integ-cli: Fix race in TestLogsSince
2015-05-13 11:35:17 -07:00
ebe9a85486
Merge pull request #13183 from runcom/fix-typo-tests-grouping
...
Fix typo to run tests grouped by RunUnprivileged
2015-05-13 11:33:14 -07:00
951c2ef2c9
Merge pull request #12226 from ahmetalpbalkan/logdrivers/refactoring
...
daemon: Logging drivers architectural refactoring
2015-05-13 11:00:50 -07:00
8eac7d0779
Merge pull request #13180 from unclejack/fix_test_name
...
integcli: change Dettach to Detach
2015-05-13 09:07:18 -04:00
a36f6a140b
Fix typo to run tests grouped by RunUnprivileged
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-13 14:24:54 +02:00
fdec5197f1
integcli: change Dettach to Detach
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-05-13 12:49:19 +03:00
e00cfbb6f2
Fix invalid tag name
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-13 14:28:52 +08:00
3401ee13f8
Merge pull request #13169 from jfrazelle/cleanup-integration
...
cleanup test-integration
2015-05-13 06:34:30 +02:00
56847ec4d4
Merge pull request #13106 from duglin/HumanizeCliErrors
...
Use stderr instead of logrus for CLI error messages
2015-05-13 05:23:56 +02:00
c6dad07b1b
Minor typo: remove redundant dot in error message in runconfig/parse.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-13 11:04:07 +08:00
2fe2f7a186
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 >
2015-05-13 02:59:11 +00:00
36d995a291
Merge pull request #11965 from duglin/DEBUG
...
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
2015-05-12 18:24:04 -07:00
3985f17812
Merge pull request #13131 from Microsoft/10662-loadonwindows
...
Windows: Build load.go
2015-05-12 18:04:33 -07:00
ec4baad954
Merge pull request #13166 from runcom/small-streamformatter-refactor
...
Refactor pkg/stremformatter - custom constructors
2015-05-12 20:28:18 -04:00
0024935f64
Use stderr instead of logrus for CLI error messages
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-12 17:22:41 -07:00
df89008f0c
Merge pull request #13099 from Microsoft/10662-pkgparsers
...
Windows: Implement parsers:kernel+os
2015-05-12 16:07:43 -07:00
e096d56713
cleanup test-integration
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-12 15:39:57 -07:00
6b700bdaca
Refactor pkg/stremformatter with custom constructors instead of passing a boolean
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-13 00:09:41 +02:00
f7ae2a372d
Windows: Impl pkg\parsers kernel+os
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-12 14:41:02 -07:00
aed8f9f76e
Windows: Build load.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-12 14:26:57 -07:00
37cb2a15bf
Merge pull request #13040 from cpuguy83/13014_fix_goroutine_leak_on_logs_follow
...
Make sure log pipes are closed
2015-05-12 13:52:49 -07:00
cb53a628b0
Merge pull request #13136 from Microsoft/10662-factoroutresolveconf
...
Windows: Don't pull in all of resolvconf
2015-05-12 13:49:47 -07:00
e0777e69cb
Merge pull request #13162 from jfrazelle/add-modprobe-br_netfilter
...
modprobe br_netfilter
2015-05-12 13:46:34 -07:00
f35038dfba
Merge pull request #13160 from runcom/remove-api-codepath-less-than-1-12
...
Remove API codepaths < 1.12
2015-05-12 13:08:36 -07:00
John Howard