f7b441f49a
Windows CI: Unit Tests stop running failing chrootarchive tests
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 7f6ef097369808d1d4eda52ff7bf0d76579741aa
Component: engine
2016-03-01 14:28:29 -08:00
e03aa51b61
Merge pull request #20823 from Microsoft/testunit-migratetests
...
Windows CI: Unit Test stop running failing migration tests
Upstream-commit: 1b6956cbc3454302b4760b46de1710ff6168d83f
Component: engine
2016-03-01 13:50:00 -05:00
b4ef71e90c
Merge pull request #20820 from thaJeztah/remove-registration-docs
...
Remove some references to "register" through login
Upstream-commit: 637813b13ee0b7b6c92506f55248ce616ff0e3b8
Component: engine
2016-03-01 10:39:53 -08:00
ccc34f5cf4
Merge pull request #20822 from Microsoft/jjh/gogit
...
Go 1.6 Git 2.7.2
Upstream-commit: 8ae0192943b5546f753dd43dbe6e6ad3291addae
Component: engine
2016-03-01 10:36:47 -08:00
753938db28
Merge pull request #20797 from Microsoft/testunit-daemonunixtests
...
Windows CI: Unit Test move Unix specific struct field tests to _unix.go
Upstream-commit: 331d2b300f87e8c1feb3cee2d12d2abfe779aaa1
Component: engine
2016-03-01 13:25:49 -05:00
6b9790d5b0
Merge pull request #20684 from yongtang/13840-follow-symlink
...
Follow symlink for --device argument.
Upstream-commit: d883002fac7778e70096584c3eed1693eb7cec17
Component: engine
2016-03-01 12:44:10 -05:00
4ce80e9419
Stopped running failing migration tests on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 734f52d1357785de364c8f4be2218805f160f604
Component: engine
2016-03-01 09:05:20 -08:00
6763064207
Go 1.6 Git 2.7.2
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: fa362e47e03e7b9b50e3642f50a4478d8b8f1243
Component: engine
2016-03-01 09:05:12 -08:00
e740d4f911
Merge pull request #20587 from MHBauer/termfixes
...
do not turn post-processing on for linux-cgo terminals
Upstream-commit: bcc59fc95125e21ad59129189ff953b7086ab497
Component: engine
2016-03-01 11:37:26 -05:00
68d6754ee4
Merge pull request #20530 from hsinko/myDev
...
Add some comments for daemon/graphdriver/aufs/aufs.go
Upstream-commit: 330fb91f7d3e89d020fb1f8dca7c1fbbf884ed5d
Component: engine
2016-03-01 11:35:35 -05:00
0b40ec5cf8
Remove some references to "register" through login
...
These were left-overs from the now deprecated
and removed functionality to registrer a new account
through "docker login"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 971c080b67836b5dd62bc9270dfb348abb8536a7
Component: engine
2016-03-01 17:33:23 +01:00
afc4d63ffe
Merge pull request #20565 from kencochrane/remove_email_on_login
...
Remove email address field from login
Upstream-commit: 2453262e7ba131fede74dbf31df41da9d2f36c34
Component: engine
2016-03-01 08:02:16 -08:00
442c4a4dc8
Merge pull request #20814 from vincentbernat/fix/zsh-completion-update-5
...
zsh: Reword some descriptions
Upstream-commit: ec2efb01d206a2bae59386b8fa33ebddb8293a3b
Component: engine
2016-03-01 14:40:41 +01:00
cc884b4924
Merge pull request #20813 from thaJeztah/update-changelog
...
Update changelog with changes from 1.10.1 and .2
Upstream-commit: 79ec9c8460ca64e347377f8d67dcfc4877b3aff4
Component: engine
2016-03-01 14:29:09 +01:00
8d596ed372
zsh: Reword some descriptions
...
Use of "Set ..." and "Specify ..." are removed in favor of directly
using nouns.
Also:
- add description for `run --isolation`
- reduce description of `run --shm-size`
- fix `daemon --bip` argument handling
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: 62a6d3e86c5754aed5d04400a7f84681d0470925
Component: engine
2016-03-01 14:21:34 +01:00
90fcd77c32
Merge pull request #20310 from hqhq/hq_cgroup_parent_docs
...
Add docs for cgroup-parent of systemd cgroup
Upstream-commit: 87fb26bc42afa4650fce88f8130fb7660ff898db
Component: engine
2016-03-01 13:20:23 +01:00
837da277cb
Merge pull request #20418 from calavera/go_1_6
...
Upgrade Go to 1.6.
Upstream-commit: 6a20165da78f1d1793b8355a6caa6fe3579f62f2
Component: engine
2016-03-01 13:52:19 +02:00
df1f754b29
Update CHANGELOG for 1.10.2
...
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit 7613ee933ccbe58806cce7484bce8e6a55e8bd89)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3da45ee939fc8600e1a9f1e05a28023c8f2a207e
Component: engine
2016-03-01 12:39:42 +01:00
6669b56201
Correct 1.10.1 CHANGELOG
...
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit ce4f13f604d6b080f239365f926246cf03f91c5a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8a6ac315ff13d198dc760bd410a2cadc6126d2db
Component: engine
2016-03-01 12:39:27 +01:00
0bb84d91b7
Update CHANGELOG for 1.10.1
...
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit f1cd0cabba47ba05400e7a609dffb571592a61e0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: fce54d772a761e22b61c45cc8881b7b17874d7c7
Component: engine
2016-03-01 12:39:09 +01:00
42a4bb9e98
Add docs for cgroup-parent of systemd cgroup
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: c7f2079a9b3d8b38a6a933524766aa77a2658393
Component: engine
2016-03-01 18:31:17 +08:00
930d301669
Merge pull request #20796 from calavera/default_windows_creds_helper
...
Set default credentials store in Windows.
Upstream-commit: 9c7e1aeeb1b9a14691dda831da4674b76852a24f
Component: engine
2016-03-01 11:12:14 +01:00
05bba97811
Merge pull request #20810 from wenchma/remove
...
Remove the duplication
Upstream-commit: d1e7f383380123d9419462165e07ae7cdb7620ce
Component: engine
2016-03-01 11:00:02 +01:00
ede5a6202a
Remove the duplication
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 9f8f28684f196ff3790ff1c738e81743821fc860
Component: engine
2016-03-01 17:53:36 +08:00
8066a67875
Merge pull request #20791 from Microsoft/jjh/testunit-pkgsymlink
...
Windows CI: Turning off pkg\symlink unit testing
Upstream-commit: dac18985fa5265c38a170b733d49a8ad31d2c645
Component: engine
2016-03-01 08:18:44 +01:00
cfff83dc7e
Follow symlink for --device argument.
...
Fixes : #13840
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 7ed569efdc822811cdac3b398a16757a54fbe4c4
Component: engine
2016-03-01 07:16:19 +00:00
44ded729ad
folders->directories
...
Signed-off-by: hsinko <21551195@zju.edu.cn >
Upstream-commit: 772f5495b7bb03a8fb97f9ae5fb5fa97c98a87b3
Component: engine
2016-02-29 21:32:30 -08:00
414f40cb7a
Merge pull request #20754 from lyndaoleary/docker-terminology
...
Changed Docker references to Docker Engine in docs
Upstream-commit: 89f6d3b0416fa3055724099d6eaa774403480ada
Component: engine
2016-03-01 05:30:45 +01:00
5954e87608
Windows CI: Unit Test move Unix specific struct field tests to _unix.go
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 957792e485a58698ad374c5a69157d9afa7879a2
Component: engine
2016-02-29 18:04:06 -08:00
2919d69a0c
Remove email address field from login
...
This removes the email prompt when you use docker login, and also removes the ability to register via the docker cli. Docker login, will strictly be used for logging into a registry server.
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: aee260d4eb3aa0fc86ee5038010b7bbc24512ae5
Component: engine
2016-02-29 17:53:27 -08:00
5692b958f8
Merge pull request #20792 from cpuguy83/more_stats_client_cleanup
...
Fixes issue with stats on start event
Upstream-commit: 187a2fb40390f52a45e5b77c2ccc2d4609e354a9
Component: engine
2016-02-29 17:33:37 -08:00
9c67867382
Changed Docker references to Docker Engine in docs
...
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com >
Upstream-commit: 0b882cc0140bc03dfe79462c5cdf77b972c94067
Component: engine
2016-03-01 00:57:23 +00:00
6a88816da7
Merge pull request #20782 from estesp/new-parent-dir-ownership
...
Fix ownership of non-existing parent dir
Upstream-commit: 67b16c73818726d9818d0229fa6cdda3e5f698b0
Component: engine
2016-03-01 01:45:38 +01:00
7097a625ab
Merge pull request #20710 from Microsoft/sjw/tp4retry_fix
...
Fixing retry hack for TP4 to return errors in all failure cases.
Upstream-commit: 6a960069596a5d43a50b7675454169aad06972ca
Component: engine
2016-02-29 19:08:24 -05:00
8fc5eda7c4
Set default credentials store in Windows.
...
Use the Windows Credentials Manager when the helper
is installed in the path.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 056c27d895e6e0c416d8d4253e99f4b211a1fb4f
Component: engine
2016-02-29 17:46:07 -05:00
7075a0e284
Upgrade Go to 1.6.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 14d5c91d87fac962bbb36c12b05f3b1603aa28a8
Component: engine
2016-02-29 17:08:52 -05:00
aa8f3c4116
Fixes issue with stats on start event
...
In situations where a client is called like `docker stats` with no
arguments or flags, if a container which was already created but not
started yet is then subsequently started it will not be added to the
stats list as expected.
Also splits some of the stats helpers to a separate file from the stats
CLI which is already quite long.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: df95474885aeaaa77eeea4c4b31a92b58fc2a67c
Component: engine
2016-02-29 16:34:42 -05:00
2180969e3a
Merge pull request #20107 from calavera/client_auth_store
...
Client credentials store.
Upstream-commit: 29ce086e38384c54f6f2d8f09578a75c4c9d9593
Component: engine
2016-02-29 22:31:34 +01:00
017161a4fc
Merge pull request #20785 from runcom/clean-cont
...
container: container_unix: remove unused func
Upstream-commit: 79258eca9bdc6e6bd0feb20a81c03973142ea16c
Component: engine
2016-02-29 13:11:12 -08:00
d5b5c504a1
Windows CI: Turning off pkg\symlink unit testing
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: eaa1708e703427a47f28eb198942f18b9d7237d8
Component: engine
2016-02-29 13:10:50 -08:00
e22172b0b1
Merge pull request #20790 from Microsoft/jjh/testunit-voltestremove
...
Windows CI: Unit Test turn off TestRemove
Upstream-commit: 3938ee413d0fab1b78879352c7defccfb78f8d43
Component: engine
2016-02-29 13:09:48 -08:00
60a83559ef
Merge pull request #20692 from coolljt0725/add_brnf_test_request
...
Add bridgeNfIptables and bridgeNfIp6tables test request
Upstream-commit: ea6d2708e2f115b9637ee11521f5f570b2819808
Component: engine
2016-02-29 15:16:27 -05:00
24e2f8a0e5
Merge pull request #20492 from WeiZhang555/export-no-privilege
...
Clean redundant error message for export
Upstream-commit: d878f512fd70928b28ca13629eb58befc14700f5
Component: engine
2016-02-29 21:14:28 +01:00
e32705bbc7
Merge pull request #20480 from wenchma/20431-filter_since_before
...
Enhancement of docker ps before and since filters
Upstream-commit: 9eb4575f8cdb8f9afb0d53d6fd4a34b077cc08da
Component: engine
2016-02-29 20:57:43 +01:00
7d62a9ef68
Merge pull request #20780 from runcom/revert-sudo-user
...
Revert sudo user
Upstream-commit: a5d98b82ea641349640d07b2f62a047b94592a5e
Component: engine
2016-02-29 11:48:24 -08:00
f3c9f69224
Merge pull request #20307 from HuKeping/trust
...
Refactor trust push
Upstream-commit: 1ba0358a10e6ad61832a47ac2f99dda7a7d57429
Component: engine
2016-02-29 11:12:09 -08:00
210548216a
Fixing retry hack for TP4 to return errors in all failure cases.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 0b82202fbbbeaad5d7ba404fb586cb4b3f37980e
Component: engine
2016-02-29 10:53:01 -08:00
6324c7793e
Merge pull request #20605 from mountkin/optimize-json-log-writer
...
make the json log writer much faster
Upstream-commit: ba5a282a83a603c3bb61cd40642af54d2088f747
Component: engine
2016-02-29 10:47:46 -08:00
70ddfe143d
Merge pull request #20749 from mountkin/validate-log-opts
...
validate log-opt when creating containers
Upstream-commit: 2391794d2695079f2dd19b10cd51aea6922b3ec9
Component: engine
2016-02-29 13:47:25 -05:00
569a4e8006
Merge pull request #20686 from clintonskitson/bugfix/plugin_desc_leak
...
Fix plugin file descriptor leaks
Upstream-commit: 29b2b0c22ba4a9c81002cd70e464ef0cfc577413
Component: engine
2016-02-29 10:44:36 -08:00