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
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
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
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
8a7585ce8e
Client credentials store.
...
This change implements communication with an external credentials store,
ala git-credential-helper. The client falls back the plain text store,
what we're currently using, if there is no remote store configured.
It shells out to helper program when a credential store is
configured. Those programs can be implemented with any language as long as they
follow the convention to pass arguments and information.
There is an implementation for the OS X keychain in https://github.com/calavera/docker-credential-helpers .
That package also provides basic structure to create other helpers.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: cf721c23e715e545eccf8484e145c2d18d6a6a23
Component: engine
2016-02-29 13:01:31 -05:00
a2d2add430
Merge pull request #20787 from itsthenetwork/Fix-Seccomp-Readme
...
Update seccomp.md
Upstream-commit: b1955a66f536dfb8fe15d00059ae527f49c35ba9
Component: engine
2016-02-29 09:54:48 -08:00
66f153da0f
Merge pull request #20774 from hqhq/hq_vender_engine_api
...
Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
Upstream-commit: b211e57f23848bd1990db84d2ccce0ce529e735a
Component: engine
2016-02-29 18:48:55 +01:00
e630a6085a
Windows CI: Unit Test turn off TestRemove
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: de6939817d20f5c2a370efc9eb207e3e8c897520
Component: engine
2016-02-29 08:57:30 -08:00
2932936552
Update seccomp.md
...
Corrected titles to use title case. Added link to default.json and some numerical detail. Changed example JSON to a portion of the actual default file, with the correct defaultAction.
Signed-off-by: Steven Iveson <steven.iveson@infinityworks.com >
Upstream-commit: 244e5fc51653b47a974ad111022ea923ddebaf05
Component: engine
2016-02-29 16:32:45 +00:00
4cc9b2c995
Merge pull request #20777 from Anonymooseable/document-plugin-types
...
Document interfaces a plugin can implement
Upstream-commit: c0c10daebf2372fdc2ca46c6535e1daac628ab48
Component: engine
2016-02-29 17:31:06 +01:00
cf5a003364
Merge pull request #20737 from mikedougherty/install-sh-multiple-keyservers
...
Use multiple keyservers in install script
Upstream-commit: 0573b814a1e78cf0e6fefc8ecd3913a95e849506
Component: engine
2016-02-29 11:17:13 -05:00
1de8cdf35e
Remove experimental GraphDriver plugin type
...
Signed-off-by: Linus Heckemann <anonymouse2048@gmail.com >
Upstream-commit: 3ef13258289ef01102c0ae01a8d9af49d36441fb
Component: engine
2016-02-29 15:59:54 +00:00
cee58ed27a
Merge pull request #20629 from wallnerryan/intro-volumes
...
Intro volume drivers in dockervolumes.md
Upstream-commit: 6c01d2a0cf4feb24bddf6830fd1683060c0ff309
Component: engine
2016-02-29 16:59:43 +01:00
47e8179868
intro volume plugins in userguide volumes
...
NOTE should be lowercase
Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com >
add link to list of plugins
Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com >
address changres
Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com >
Upstream-commit: b6fdcd3a342dc882955253e0a39711ed4ac078fc
Component: engine
2016-02-29 10:56:32 -05:00
45b2db0eaa
Merge pull request #20773 from Microsoft/jjh/testunitdockerlayer
...
Windows CI Unit Test: Docker layer turn off failing tests
Upstream-commit: eb22fcc229b364dd4429823c96b8f2e585e73217
Component: engine
2016-02-29 10:46:32 -05:00
