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
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
ebb89af810
Merge pull request #23776 from Microsoft/ShutdownError
...
Windows: Prevent logging errors when shutting down an already shut down container
Upstream-commit: 138f9538f3a740ef56b1a6cd43ae537a78f4d896
Component: engine
2016-06-22 12:11:00 -07:00
c04403422d
Merge pull request #23829 from LK4D4/cleanup_unused
...
api,daemon: cleanup some unused stuff
Upstream-commit: 506234e3f0f6d8f8a0629e09f38dfe96ada025c2
Component: engine
2016-06-22 11:58:57 -07:00
266d9f9808
Merge pull request #23832 from tonistiigi/unify-swarm-init-update
...
Unify swarm init and update options
Upstream-commit: df6630f6a3c08548f355a255e18f01c9fcb0ad86
Component: engine
2016-06-22 11:56:07 -07:00
f6a8b95a82
Merge pull request #23835 from swernli/loggerfix
...
Fixing file handle leak for "docker logs"
Upstream-commit: 7eae48cd21f12a64c97c76f60412f32a2f1ade78
Component: engine
2016-06-22 11:52:55 -07:00
d08991bd63
Add modules for secure overlay network to check-config.sh
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: c355e059cc1a4f66338a039240195c66dc928e73
Component: engine
2016-06-22 10:51:13 -07:00
9e92fb5474
all: fix usage of some variables
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 57e14714ee85e67f59d8c22aed23dc875cf2e58c
Component: engine
2016-06-22 10:40:32 -07:00
0014a77b9b
Vendoring libnetwork ed311d0
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: e26c513fa818a57b4ea572121e153cf6f056e1ee
Component: engine
2016-06-22 09:40:20 -07:00
57899c6630
Vendoring vishvananda/netlink 734d02c
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 58b8b8fa1555223c1144f08fc4536ffaa4d12fd0
Component: engine
2016-06-22 09:37:17 -07:00
eee2bc634c
Merge pull request #23846 from HackToday/fixdoc
...
Fix the missing 'ls'
Upstream-commit: b2da02dc7e4695dbe42efe25fab0684f3b846b30
Component: engine
2016-06-22 11:08:28 +02:00
425fb8faf5
Fix the missing 'ls'
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkq5325@gmail.com >
Upstream-commit: cbd240581f274c3599efb1c43b01cb61607c79d0
Component: engine
2016-06-22 08:40:35 +00:00
a2ad68a66b
Merge pull request #23818 from shishir-a412ed/doc_fix_PR19367
...
Man page fix: Mention supported drivers for --storage-opt size option in docker create/run.
Upstream-commit: 937c0a16483147ebb9641bc7280a1bb813404ed0
Component: engine
2016-06-22 11:59:10 +10:00
61122f748a
Merge pull request #23820 from ericbarch/master
...
Add missing words in the swarm docs
Upstream-commit: e770b80d80485e99cdfb8e25341a087624d13b3a
Component: engine
2016-06-22 11:58:09 +10:00
a75adf3964
Merge pull request #23797 from liubin/fix-typo
...
fix some typos
Upstream-commit: 4962fea757415087755d7683e73bc0c7c7a39921
Component: engine
2016-06-22 11:56:48 +10:00
6e7f3b1cd8
Merge pull request #23738 from psiclops/typos
...
Fix misspell typos
Upstream-commit: e76e52b38b9829ccf613995f2afa0394230800ef
Component: engine
2016-06-22 11:56:13 +10:00
675aa5766a
Fixing file handle leak for "docker logs"
...
If "docker logs" was used on an offline container, the logger is leaked, leaving it up to the finalizer to close the file handle, which could block removal of the container. Further, the json file logger could leak an open handle if the logs are read without follow due to an early return without a close. This change addresses both cases.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 54f11b84d218c1a7ff4ab4e2148819265da213bc
Component: engine
2016-06-21 18:40:30 -07:00
734344cd94
Fix opts tests after default port fix
...
The code for default port was already there but
it didn’t work because split function errored out
before. This should be the desired behavior that
matches daemon listen address with swarm listen
address.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0a4a0d9800aa62daf2b980b82c1840cd6f7d0e34
Component: engine
2016-06-21 17:14:55 -07:00
8c9dd4362c
Unify swarm init and update options
...
Add api side validation and defaults for init and
join requests.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: fb3eb1c27ef5520571c599ead8a72b343748db39
Component: engine
2016-06-21 16:34:32 -07:00
738f6a0c73
Merge pull request #23712 from aaronlehmann/parallel-push-multiple-registries
...
Fix parallel push of the same image to different registries
Upstream-commit: 3e0f96cdb374caa5e5927bb96ee54a5a2934258c
Component: engine
2016-06-22 00:40:35 +02:00
db2a93d1a1
Merge pull request #23783 from Microsoft/WaitExitDebug
...
Windows: Added stateinfo to WaitExit info to aid debugging daemon hangs
Upstream-commit: ca669eb849da992aa218dfa48a830a0fc0966cbb
Component: engine
2016-06-21 14:32:31 -07:00
af6a729a98
Merge pull request #23817 from kencochrane/fix_install_script
...
Fixed install script that was not working for RHEL7 host
Upstream-commit: b02e7faa85fc8e6e0422a78cb73a7af39ef6eb48
Component: engine
2016-06-21 14:20:42 -07:00
44cb4a4db6
api,daemon: cleanup some unused stuff
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ed5d335e22143b35f928e5a8740b046c21db808b
Component: engine
2016-06-21 14:15:19 -07:00
34ef68e15d
Added stateinfo to WaitExit info to aid debugging daemon hangs
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 9aa9bda1780b68946582e36892703fbb4f5f892d
Component: engine
2016-06-21 12:41:08 -07:00
0f2b3a9f20
Man page fix: Mention supported drivers for --storage-opt size option in docker create/run
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: dc3fdfbe5bb5aff4ebd8f7025ace4bd6009d3db4
Component: engine
2016-06-21 14:53:37 -04:00
fd4459c7c2
Merge pull request #23700 from Microsoft/jjh/fixrotestcases
...
Windows: Fix RO test cases
Upstream-commit: 7b2b4eb40cfd907f3aa20b630cc2feeb8460404a
Component: engine
2016-06-21 09:01:43 -07:00
be2677812e
Add missing words in the swarm docs
...
Signed-off-by: Eric Barch <barch@tomesoftware.com >
Upstream-commit: db158e9182f86adc721d6c401782983bfe51fd49
Component: engine
2016-06-21 08:28:59 -07:00
0251763747
Fixed issue #23787 install script not working for RHEL7 host
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: 0e84474672fb30449028b4f7a678d5ab6a81f102
Component: engine
2016-06-21 09:40:00 -04:00
d011d97fca
Merge pull request #23816 from SvenDowideit/update-docker4-links
...
Now that the Docker4 links are online, we can use them
Upstream-commit: 96a58bdba833ebbbe59e47fd9b028766c5d46dfc
Component: engine
2016-06-21 23:04:43 +10:00
d37f26ec66
Now that the Docker4 links are online, we can use them
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 587d2f9d8132c4ba8cfa74e5f0f2ec3328fdf9b9
Component: engine
2016-06-21 12:55:41 +00:00
75f31f238e
Merge pull request #23757 from AkihiroSuda/overlay2doc
...
Add overlay2 description to overlayfs-driver.md
Upstream-commit: 96e3f3e2d040c0b5120efd5bee994b13d44f8087
Component: engine
2016-06-21 14:06:57 +02:00
49342f2690
Merge pull request #23805 from albers/completion--cpu-shares--c
...
bash completion for `-c` alias to `--cpu-shares`
Upstream-commit: a6f7167c0ac4357cab40df9b38532f945bf1a011
Component: engine
2016-06-21 21:19:06 +10:00
1387ff4c20
Merge pull request #23804 from albers/completion-btrfs-min_space
...
bash completion for `docker daemon --storage-opt btrfs.min_space`
Upstream-commit: 5ba6b1e89c61504eafaf4d77b585b0b0e27d204f
Component: engine
2016-06-21 21:18:49 +10:00
c574280c95
Merge pull request #23803 from albers/completion-run--storage-opt
...
bash completion for `docker {run,create} --storage-opt`
Upstream-commit: a1eb6528ebba8bf714e6be4a9405bf80f7ca7725
Component: engine
2016-06-21 21:18:32 +10:00
