33bb05c194
Merge pull request #23281 from yongtang/23211-spf13-cobra-update
...
Use spf13/cobra for docker update
Upstream-commit: e5a8a7747ef8b9ac6ed4e508cd16a5cf2a44485c
Component: engine
2016-06-24 14:31:53 -07:00
da85d118fb
Merge pull request #23940 from allencloud/fix-err-msg
...
fix error message and typos in swarm cluster
Upstream-commit: 7ff546467de3fa3d1c1104e9f40c6d16742ebac0
Component: engine
2016-06-24 16:57:01 -04:00
e535398871
Merge pull request #23935 from LK4D4/fix_net_create_use
...
cli: fix network create usage
Upstream-commit: 824290a37e09f3411ceec439566c1e6c968a80ed
Component: engine
2016-06-24 16:55:12 -04:00
6741371d76
Merge pull request #23943 from aaronlehmann/task-updates-warning
...
Remove log warning on task update
Upstream-commit: caba54396ca0626449f3c261b1d0363911426d13
Component: engine
2016-06-24 16:43:01 -04:00
f3ebf274bf
fix error message and typos in swarm cluster
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 39bc10c36d40677c11a800b4346c5cddec2b997d
Component: engine
2016-06-25 03:10:18 +08:00
5fee17f637
Remove log warning on task update
...
This warning appears in the course of normal use of swarm mode. Since
it's meant more as an internal TODO than something which should be
exposed to a user, remove the log message.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 39c93cfb47783f2531ba44f062fd9a8b351d2224
Component: engine
2016-06-24 12:07:47 -07:00
b45c320ba6
Merge pull request #23914 from tonistiigi/upadate-manager-error-message
...
Add better error messages for unavailable swarm commands
Upstream-commit: e8ec19bd877847ddfd42cae4eddec83088e234fe
Component: engine
2016-06-24 12:02:34 -07:00
1d708b7135
Merge pull request #23933 from yp-engineering/service-log-typo
...
Fixing typo on service log output.
Upstream-commit: b73b303b1c974ea6d168eebdc2011b0802999ff1
Component: engine
2016-06-24 11:56:31 -07:00
c752679e24
Merge pull request #23872 from sfsmithcha/fix_scale_service_output
...
correct output description - only one task is running on manager
Upstream-commit: 39211d113bf16b371e49c12884020912c9c2c5ed
Component: engine
2016-06-24 11:04:28 -07:00
299779b4ac
Merge pull request #23360 from sainath14/rename_error
...
docker rename fix to address the issue of renaming with the same name
Upstream-commit: 88d1ee6c112d980a63c625389524047fea32e6d9
Component: engine
2016-06-24 19:54:09 +02:00
6414685519
Merge pull request #23918 from LK4D4/avoid_copy
...
pkg/pools: avoid copy of sync.Pool
Upstream-commit: 296b5c761f0aa853062fcb9fb10b172845a1986a
Component: engine
2016-06-24 19:35:43 +02:00
dda81cb1a9
Merge pull request #23921 from tonistiigi/test-timeouts
...
Increase test timeouts for node state changes
Upstream-commit: 23696e82658e8be1d428c63c52b52a51476d4248
Component: engine
2016-06-24 19:21:56 +02:00
009e2dd2e1
Add better error messages for unavailable swarm commands
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 803733120a1f9f080c6403f2a3717987393f1f0d
Component: engine
2016-06-24 10:14:57 -07:00
41c3862b06
cli: fix network create usage
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 159e7341ad80d6926fd9c09585afcc2abda25415
Component: engine
2016-06-24 09:32:39 -07:00
a463fd07fe
Merge pull request #23881 from tonistiigi/exec-wait
...
Fix error reporting on executor wait
Upstream-commit: e82dcf1c6de82680ae34a64735d0da0c080085ba
Component: engine
2016-06-24 11:18:49 -04:00
b44cab8db2
Merge pull request #23733 from tkopczynski/20784-builder-dockerfile-dispatchers
...
Builder/dockerfile/dispatchers.go unit tests
Upstream-commit: 4d7e08d6752f7413417de9ef2632266ee52c5897
Component: engine
2016-06-24 11:10:16 -04:00
1518772054
Merge pull request #23802 from inercia/fix_docker_cli_run_test
...
Make sure we compare string with the same capitalization
Upstream-commit: f6326d307667ea92ce6931985616d85d4e3248ed
Component: engine
2016-06-24 10:27:29 -04:00
dcf702388f
Merge pull request #23883 from AkihiroSuda/md2man105
...
update go-md2man to v1.0.5
Upstream-commit: 2fe294c16a7d75b9dcacda55aecf3bec6efe4781
Component: engine
2016-06-24 10:58:25 +02:00
645bbecbd4
Merge pull request #23875 from tonistiigi/task-node-down
...
Do not show tasks from down nodes as active in ls
Upstream-commit: cf54dfba349627a24c6f7b8e035367a7a9f68f84
Component: engine
2016-06-24 10:07:25 +02:00
bd0a2c513f
Merge pull request #23919 from Microsoft/jjh/prefix
...
Windows: Ensure frozen cope with prefix
Upstream-commit: bf08aae8522001f3358afe82aec52fea0d5d0458
Component: engine
2016-06-23 19:46:55 -07:00
ba17dc4da8
Merge pull request #23824 from mlaventure/fix-apt-repo-components-fields
...
Fix the value of the Components value in apt {In,}Release files
Upstream-commit: 45f76db06d4ac7017147c8ac6925906d41ab4428
Component: engine
2016-06-23 17:54:13 -07:00
4bcb0e068c
Increase test timeouts for node state changes
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 2e5da4434126309f2395cc3d5b2013674155ae5c
Component: engine
2016-06-23 17:30:42 -07:00
f15a4c4a3e
Windows: Ensure frozen cope with prefix
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b820ead42674eca25c9718fb4de924405ec0c555
Component: engine
2016-06-23 16:39:16 -07:00
f335a08e05
pkg/pools: avoid copy of sync.Pool
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ba3af336eb0bd5bd6082b41bb4ce0ea542c3f008
Component: engine
2016-06-23 16:09:13 -07:00
6af42f8c0d
Merge pull request #23912 from dmcgowan/fix-overlay2-whiteout-exclusion
...
Fix overlay2 ignoring whiteout files
Upstream-commit: 37fe4bdb59cae499cefb0d8bce8c28b894cd6f98
Component: engine
2016-06-24 01:06:38 +02:00
852cc7fc30
Fixing typo on service log output.
...
Signed-off-by: Adam Avilla <aavilla@yp.com >
Upstream-commit: 7cc6fe575895dca6c50c4eadb0fd4c4986d05048
Component: engine
2016-06-23 14:54:40 -07:00
066b0582fe
Fix overlay2 ignoring whiteout files
...
Currently when overlay creates a whiteout file then the overlay2 layer is archived,
the correct tar header will be created for the whiteout file, but the tar logic will then attempt to open the file causing a failure.
When tar encounters such failures the file is skipped and excluded for the archive, causing the whiteout to be ignored.
By skipping the copy of empty files, no open attempt will be made on whiteout files.
Fixes #23863
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: bd13c53f8dc1504c9e681dfabef2afc1685ccec7
Component: engine
2016-06-23 13:34:38 -07:00
826b691215
Merge pull request #23760 from SerhatG/docker_doc_cmd_shell_comment
...
Docker reference error CMD with ENV variables
Upstream-commit: 86d5c7e759e099b2662770be82cf9248ab0df5ba
Component: engine
2016-06-23 13:34:14 -07:00
7c1b9df9b0
Merge pull request #23853 from docker/linkchecker-updates
...
Removing some url links that can be resolved using src markdown links
Upstream-commit: 563973a183bc100e78688f3b5e7b2244c341700a
Component: engine
2016-06-23 12:34:45 -07:00
47e88f8ceb
Merge pull request #23857 from davidmichaelkarr/patch-1
...
Update work-with-networks.md: Fix Subnet and Gateway props to match command line
Upstream-commit: 6b3faf781f272c2e1f6922bcb35c9b627f323743
Component: engine
2016-06-23 12:25:02 -07:00
fbf0465b15
Merge pull request #23790 from tonistiigi/skip-pull
...
Skip always pulling images on integration tests
Upstream-commit: 487931902c1177352e4eceec1b5ef558a5ba24cc
Component: engine
2016-06-23 11:47:33 -07:00
5c41618370
Merge pull request #23859 from aboch/vnd
...
Update check-config.sh, netlink and libnetwork vendoring
Upstream-commit: 18398b2933577d9704e69b0b8312b495e487eeb5
Component: engine
2016-06-23 20:34:02 +02:00
14bdbbb927
Merge pull request #23896 from runcom/f24-contrib
...
contrib: builder: rpm: add Fedora 24
Upstream-commit: 4cad55026ac74915c45e1b6657910a5e269d3b1f
Component: engine
2016-06-23 20:08:35 +02:00
7d0f5567de
Merge pull request #23899 from orkaa/evalulate-rename
...
For the lulz! (evalulate -> evaluate)
Upstream-commit: 3c40f22d704741a50ba99c121b9c34c4eeda845f
Component: engine
2016-06-23 19:23:54 +02:00
fed645b1f8
Merge pull request #23862 from LK4D4/fix_unused
...
all: fix usage of some variables
Upstream-commit: c9175a6deb70887afc757702a69bf750b9668fd4
Component: engine
2016-06-23 10:21:10 -07:00
59b0cca4d4
For the lulz! (evalulate -> evaluate)
...
Signed-off-by: orkaa <orkica@gmail.com >
Upstream-commit: 1bdbfa57709586f9fa747c2323bc3cd3b03e90f0
Component: engine
2016-06-23 16:26:43 +02:00
ef5445e5b7
contrib: builder: rpm: add Fedora 24
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 0b83f27328eab843d79c94dd603f52e8fb9c013b
Component: engine
2016-06-23 12:31:11 +02:00
cfb578f331
Merge pull request #23888 from sdurrheimer/zsh-completion-event-load-save
...
Add zsh completion for 'load' and 'save' image events
Upstream-commit: e3a698fcd08026a4ac88ce230d0ea4934003a0c6
Component: engine
2016-06-23 10:13:01 +02:00
b45b2ebcea
Merge pull request #23890 from sdurrheimer/zsh-completion-link-local-ip
...
Add zsh completion for 'docker {create,run,network connect} --link-lo…
Upstream-commit: 28f4a8ca558a7cac3626c043958e46e252623092
Component: engine
2016-06-23 10:12:05 +02:00
d116aab7ed
Merge pull request #23891 from sdurrheimer/zsh-completion-run-storage-opt
...
Add zsh completion for 'docker run --storage-opt size='
Upstream-commit: 6211570de1382867c2083e5bf2d7363354d44c2d
Component: engine
2016-06-23 10:11:02 +02:00
3aab922488
Merge pull request #23892 from sdurrheimer/zsh-completion-cpu-shares-c
...
Re-Add zsh completion for '-c' alias to '--cpu-shares'
Upstream-commit: 29717dd34725ff71665235e3d9928d4642ef160b
Component: engine
2016-06-23 10:09:59 +02:00
e3836198d3
Merge pull request #23889 from sdurrheimer/zsh-completion-storage-driver-overlay2
...
Add zsh completion for 'docker daemon --storage-driver (overlay2|vfs)'
Upstream-commit: 9ebc423e164dd09f6335bc7cb6781015cb55877c
Component: engine
2016-06-23 10:08:38 +02:00
aeeb26f5f9
Re-Add zsh completion for '-c' alias to '--cpu-shares'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 4c23ac0ae5103a1238c25cd1216507e9d6eec779
Component: engine
2016-06-23 08:57:39 +02:00
ba1a95ea00
Add zsh completion for 'docker run --storage-opt size='
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 857e7d6ae4f78184c70b2047ed45b24a6732537d
Component: engine
2016-06-23 08:52:42 +02:00
541d0255f6
Add zsh completion for 'docker {create,run,network connect} --link-local-ip'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 704d9b6864cc81a1564f482a2dfbaa32b9c5e905
Component: engine
2016-06-23 08:44:08 +02:00
0911fc3a5d
Add zsh completion for 'docker daemon --storage-driver (overlay2|vfs)'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 8e582a257326496cc27d30751b759a37f993d116
Component: engine
2016-06-23 08:35:36 +02:00
148092dc76
Add zsh completion for 'load' and 'save' image events
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: e2f1f699b39d30d71a9afc9af7027088970aa4fd
Component: engine
2016-06-23 08:29:24 +02:00
a880fa14a9
update go-md2man to v1.0.5
...
Due to the issue of go-md2man, a numbered list in `man docker login` was not rendered correctly.
a8f937e113suda.akihiro@lab.ntt.co.jp >
Upstream-commit: cfe16e0d5b4bb7d1d194553f2a82cc1879d60e6b
Component: engine
2016-06-23 01:58:37 +00:00
9d859318a6
Fix error reporting on executor wait
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: c895a76f1076c782011e9decf58ab6548cf0fb35
Component: engine
2016-06-22 18:12:51 -07:00
a185c1fb92
Do not show tasks from down nodes as active in ls
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 5d4401d6d72c647fa61501c40949b2d67c3f958b
Component: engine
2016-06-22 14:49:24 -07:00
