gissehel
e036bf6c07
explicit way to express that those are different choice and not just one big file to create
...
Signed-off-by: gissehel <public-devgit-dantus@gissehel.org >
2015-11-10 11:41:19 +01:00
Vincent Demeester
fb2bae5e16
Merge pull request #17857 from sdurrheimer/zsh-completion-stats-all
...
Add zsh completion for 'docker stats --all -a'
2015-11-10 11:06:32 +01:00
Sebastiaan van Stijn
34916dcc4b
Merge pull request #17467 from WeiZhang555/fix-doc
...
fix format of man page
2015-11-10 09:50:31 +00:00
Liu Hua
343e15fa3f
remove unnecessary logs from daemon
...
if daemon encounters removing-file error. It will record two
similar logs as following . The later is meaningful for client, But not for
daemon. So remove it.
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
2015-11-10 17:44:38 +08:00
David Gageot
fb986b23e0
Merge pull request #2207 from jeanlaurent/1737-virtualbox-installation-path
...
Fix #1737 - Detect non default VirtualBox Installation Path
2015-11-10 10:02:38 +01:00
Jean-Laurent de Morlhon
b6ca1035bd
Fix for #1737 - Better detect non default VirtualBox Installation Path
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2015-11-10 09:52:38 +01:00
David Gageot
7179139e16
Merge pull request #2233 from natemcmaster/patch-1
...
Update command-line arguments for hyper-v driver
2015-11-10 09:18:04 +01:00
Jean-Laurent de Morlhon
f3065ae771
Merge pull request #2235 from anthonydahanne/master
...
Fix typo : info, not version
2015-11-10 09:16:11 +01:00
Jeffrey Morgan
dd19fbeaf5
Merge branch 'master' of github.com:kitematic/kitematic
2015-11-09 23:54:43 -08:00
Jeffrey Morgan
e84a26af15
Add Creating Container message when container is finished downloading
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-11-09 23:54:35 -08:00
Steve Durrheimer
ba2a5a420d
Add zsh completion for 'docker stats --all -a'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-11-10 08:47:46 +01:00
Nathan LeClaire
2fe390babc
Update flag help explanation
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-09 23:26:40 -08:00
Lei Jitang
e035d27223
Show warning when user specify dm.basesize for already initialized devicemapper drive
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-11-10 14:50:19 +08:00
Antonio Murdaca
6f2c6111d4
Merge pull request #17843 from LK4D4/discovery_refactor
...
Refactoring in daemon/discovery.go
2015-11-10 07:34:11 +01:00
Doug Davis
70579bd558
Merge pull request #17847 from LK4D4/exec_unnec_var
...
Remove unnecessary var block in monitorExec
2015-11-09 23:32:38 -06:00
Michael Chiang
8bb8146367
Merge pull request #1198 from kitematic/change-width
...
Increasing width by 70px to have 3 columns of the AppStore.
2015-11-09 21:25:58 -08:00
Michael Chiang
50dbf5ee31
Increasing width by 70px to have 3 columns of the AppStore.
...
Increasing width by 70px to have 3 columns of the AppStore.
2015-11-09 21:09:01 -08:00
Shijiang Wei
76992f3e23
remove the unused DefaultNetwork member from daemon.Config
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-11-10 09:51:15 +08:00
Zhang Wei
d790469681
Fix man pages
...
Add contents and fix format problem for man pages.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-11-10 09:33:55 +08:00
Sebastiaan van Stijn
c97ac4daf0
Merge pull request #17279 from someara/articles-chef
...
Documenation update - articles/chef
2015-11-10 00:56:41 +00:00
David Calavera
95903ece60
Merge pull request #17844 from anthonydahanne/master
...
Implicitly use swarm:latest
2015-11-09 16:10:19 -08:00
Alessandro Boch
c7cd659624
Fix fixed-cidr daemon option
...
- Logic is broken when gateway ip falls in ip-range
and ip-range is not the first block in the network
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-11-09 15:51:46 -08:00
Anthony Dahanne
2a63a0ef53
Fix typo : info, not version
...
To retrieve the engine configuration
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com >
2015-11-09 15:51:28 -08:00
Donald Huang
a902a738ff
remove openstack swift from docs
2015-11-09 23:39:50 +00:00
Aaron Lehmann
6664a1384e
Fix empty delete requests with Swift fs driver
...
The Delete method lists objects under the given path and tries to delete
all of them with a bulk delete request. If the path has no objects
underneath it, the body of this request will be empty, which causes
HTTP-level issues. Specifically, Go's HTTP client senses the empty
request buffer and doesn't include a Content-Length, which causes the
Swift server to fail the request.
This commit fixes the problem by avoiding sending empty bulk delete
requests. This is the correct thing to do anyway, since there's no
reason to request deletion of zero objects.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-11-09 15:33:05 -08:00
Alessandro Boch
9c395537bc
Vendoring libnetwork 5978c276ad20e104d6acd749da6ee6a8930055ae
...
- To bring in ip-range fix
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-11-09 15:29:54 -08:00
John Howard
51cf074e77
Tidy hostconfig struct
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-09 15:24:23 -08:00
Alexander Morozov
d83b5dc177
Refactoring in daemon/discovery.go
...
Replace time.Sleep with time.Tick and remove unnecessary var block.
Use Warn log-level instead of error.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-09 15:21:27 -08:00
David Calavera
fa210a01be
Merge pull request #17838 from calavera/revert_17579
...
Revert "Tidy config/hostconfig structures"
2015-11-09 15:21:26 -08:00
Alexander Morozov
445675e808
Remove unnecessary var block in monitorExec
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-09 15:14:20 -08:00
Tibor Vass
62b484411e
Merge pull request #17779 from calavera/fix_dns_regression
...
Use an empty slice as default value for DNS, DNSSearch and DNSOptions.
2015-11-09 18:07:07 -05:00
Anthony Dahanne
4efe0def0a
Implicitly use swarm:latest so that master and agent use the same version of swarm
...
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com >
2015-11-09 15:05:17 -08:00
Nate McMaster
a43d13843b
Update command-line arguments for hyper-v driver
...
Signed-off-by: Nate McMaster <nate.mcmaster@gmail.com >
2015-11-09 14:55:34 -08:00
Joffrey F
774d852f93
Merge pull request #2335 from dnephin/volumes_refactoring
...
Some small refactoring around volumes
2015-11-09 14:05:52 -08:00
Daniel Nephin
e5fbf35ce1
Merge pull request #2351 from shin-/2322_config_hash_volumes_from
...
Update service config_dict computation to include volumes_from mode
2015-11-09 16:26:47 -05:00
David Calavera
143f3579b0
Merge pull request #17450 from rhatdan/selinux
...
Fix relabel for SELinux
2015-11-09 13:19:28 -08:00
David Calavera
58b270c338
Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
...
Another try at dockerversion placeholder for library import
2015-11-09 13:15:50 -08:00
Joffrey F
a1e140f5a3
Update service config_dict computation to include volumes_from mode
...
Ensure config_hash is updated when volumes_from mode is changed, and
service is recreated on next up as a result.
Signed-off-by: Joffrey F <joffrey@docker.com >
2015-11-09 13:07:26 -08:00
David Calavera
3a1200f9f1
Revert "Tidy config/hostconfig structures"
...
This reverts commit ad5052df23 .
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-11-09 15:46:45 -05:00
Doug Davis
6990f8c616
Allow for env vars to have spaces in some cases
...
Closes #17781
This allows for env vars in EXPOSE to be parsed for spaces so that each
"word" is then treated independently instead of as a single word/arg.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-11-09 12:42:56 -08:00
Nathan LeClaire
bc7da2b0fa
Merge pull request #2172 from dgageot/2154-query-virtualbox-serially
...
FIX #2154 query virtualbox serially
2015-11-09 12:00:03 -08:00
David Calavera
69bc4ebe7a
Merge pull request #17819 from tonistiigi/17766-fix-opq-dot
...
Fix opq whiteouts problems for files with dot prefix
2015-11-09 11:08:31 -08:00
Dan Walsh
d9011b3617
Fix relabel for SELinux
...
With the changes merged into runc/libcontainer, are now causing
SELinux to attempt a relabel always, even if the user did not
request the relabel.
If the user does not specify Z or z on the volume mount we should
not attempt a relabel.
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
2015-11-09 14:04:57 -05:00
Vincent Demeester
e509fe604c
Merge pull request #17816 from coolljt0725/remove_execdriver_env
...
Remove DOCKER_EXECDRIVER env
2015-11-09 19:59:18 +01:00
David Calavera
56c8d4aaef
Merge pull request #17834 from LK4D4/update_runc
...
Update runc to introduce RelabelNeeded function
2015-11-09 10:58:54 -08:00
Alexander Morozov
2786af3add
Merge pull request #17775 from vdemeester/16756-integration-cli-checkers-runs-unix
...
Use checker for docker_cli_run_unix_test.go
2015-11-09 10:44:32 -08:00
Vincent Demeester
8054a30387
dockerversion placeholder for library import
...
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-11-09 19:32:46 +01:00
David Calavera
0631ec6ca0
Merge pull request #17810 from cpuguy83/graph_cleanup
...
Graph: Un-export non-externally used functions
2015-11-09 10:30:13 -08:00
David Calavera
e1910a8e23
Merge pull request #17829 from albers/completion-stats--all
...
bash completion for `docker stats --all`
2015-11-09 10:29:33 -08:00
Michael Chiang
94bebc8018
Merge pull request #287 from leepa/fixtypo
...
Fix typo in anonymous
2015-11-09 10:22:59 -08:00