David Calavera
af9757576c
Merge pull request #17556 from donhcd/testForStatsVersioning
...
Test for stats versioning
2015-11-17 11:19:34 +01:00
David Calavera
6f1bc096a6
Merge pull request #18025 from Microsoft/10662-ArgumentEscaping
...
Windows: Fix docker exec
2015-11-17 11:14:54 +01:00
David Calavera
a2d87d14ac
Merge pull request #18037 from dm4/fix-aufs-markdown-syntax
...
Fix Markdown syntax error in aufs-driver.md
2015-11-17 11:13:01 +01:00
Lee, Meng-Han
ea04764059
Fix Markdown syntax error in aufs-driver
...
Signed-off-by: dm4 <dm4@skymizer.com >
2015-11-17 17:38:36 +08:00
David Calavera
b665730d2c
Make NormalizeLocalName to not reach the network to normalize names.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-11-17 03:31:32 -05:00
Trevor Pounds
a25988cf76
Fix typo when --expose and --net are specified.
...
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com >
2015-11-16 22:01:20 -08:00
Nathan LeClaire
537f89e775
Merge pull request #2315 from nathanleclaire/changelog
...
Update CHANGELOG.md
2015-11-16 18:38:43 -08:00
Nathan LeClaire
405d2179c1
Merge pull request #2309 from nathanleclaire/bump_0.5.1-dev
...
Bump 0.5.2 dev
2015-11-16 18:38:27 -08:00
Alexander Morozov
81aa1b507f
Remove cgroups mounting in dind
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-16 17:10:53 -08:00
Nathan LeClaire
746b3cc9b6
Bump version to 0.5.2-dev
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-16 16:55:19 -08:00
Nathan LeClaire
d9946fdc6b
Update CHANGELOG.md
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-16 16:45:49 -08:00
Tibor Vass
ef424c108a
Merge pull request #17988 from Microsoft/jjh/pushv2
...
Windows [TP4] Fix push to not kill daemon
2015-11-17 01:28:34 +01:00
Alexander Morozov
292a15e40a
Use /usr/lib/os-release if /etc/os-release is missing.
...
As per os-release spec, /usr/lib/os-release file should be tried if
/etc/os-release is missing.
http://www.freedesktop.org/software/systemd/man/os-release.html
Thanks James Hunt <james.o.hunt@intel.com > and
Dimitri John Ledkov <dimitri.j.ledkov@intel.com > for contribution.
Close #17174
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-16 16:21:31 -08:00
Victor I. Wood
ac526193af
change "Web" to "web" to match case-sensitive name used for creation; enquoted bash cd command for un-tar example
...
Signed-off-by: Victor I. Wood <viw@t2am.com >
2015-11-16 12:41:06 -08:00
Alexander Morozov
25b37e2f04
graph/graph.go: simplify appending to slice in map in byParent
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-16 12:02:35 -08:00
Darren Stahl
d7692b02bd
Typo in previous PR processConfig, not c.ProcessConfig
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
2015-11-16 11:56:01 -08:00
Nathan LeClaire
7e8e38e148
Merge pull request #2308 from nathanleclaire/bump_0.5.1
...
Bump version to 0.5.1
2015-11-16 11:12:17 -08:00
Nathan LeClaire
7e8949a8ea
Bump version to 0.5.1
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-16 10:23:02 -08:00
Alexander Morozov
a3065fa48f
Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
...
Allow configurable metadata for Splunk log driver
2015-11-16 10:11:27 -08:00
moxiegirl
4b706195d2
Merge pull request #17515 from azurezk/fixdoc
...
fix doc of volume name conflict
2015-11-16 09:15:50 -08:00
Sebastiaan van Stijn
e88ffba2ec
Merge pull request #18016 from moxiegirl/carry-17453
...
docs: modifying volumes guide to remove ambiguity. Signed-off-by: And…
2015-11-16 17:35:04 +01:00
Sebastiaan van Stijn
7c5cdda74e
Merge pull request #17604 from RyanDeng/fix_cpuPercent_extremelyHigh
...
fix the bug: cpu percent will extremely high
2015-11-16 17:26:29 +01:00
Andre Granovsky
be2152116c
docs: modifying volumes guide to remove ambiguity. Signed-off-by: Andre Granovsky <robotciti@live.com>
...
Adjusted as per comment.
Rebase and squash by moxigirl
Signed-off-by: Andre Granovsky <robotciti@live.com >
2015-11-16 08:24:26 -08:00
Nick Gauthier
a34a394810
skip printing swarm info when host options swarm info is nil
...
Fixes #2252 #2280
Signed-off-by: Nick Gauthier <ngauthier@gmail.com >
2015-11-16 15:54:16 +01:00
Luca Orlandi
fe123edb08
Update ubuntulinux.md
...
Remove '*' for purge
Signed-off-by: Luca Orlandi <luca.orlandi@gmail.com >
2015-11-16 13:29:36 +01:00
Tibor Vass
92487d7fb4
Merge pull request #17985 from Microsoft/jjh/firstboot
...
Windows: [TP4] Fix regression on second or later container starts
2015-11-16 10:03:46 +01:00
Olivier Gambier
15fecaec59
Merge pull request #2301 from skatsuta/doc-inactive-hyphen
...
docs: show "-" for "inactive" machines
2015-11-16 09:13:14 +01:00
Olivier Gambier
717965784d
Merge pull request #2297 from yamamoto-febc/fix_call_godep
...
Change godep command call to use the GODEP variable
2015-11-16 09:12:06 +01:00
Kunal Kushwaha
aa7fd884e6
Supported added for reterving Plugin list for Network and Volume.
...
Also, plugin information in docker info output.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp >
2015-11-16 15:28:09 +09:00
Soshi Katsuta
4a5e8efc59
docs: show "-" for "inactive" machines
...
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com >
2015-11-16 15:21:10 +09:00
John Howard
b2771b4456
Windows: Disable links
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-15 21:32:31 -08:00
Vincent Demeester
3b1acde99b
Merge pull request #17995 from albers/completion--volume-driver
...
bash completion for `docker {run,create} --volume-driver`
2015-11-16 04:40:20 +01:00
Tianon Gravi
927e1e98b7
Remove "-linkmode external"
...
We're having to override it in so many places that it no longer seems worthwhile to bother. On top of that, the reason we did it in the first place was for being able to compile devicemapper statically, which still works after this change (either due to other changes in the way we build, or improvements in Go itself).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-11-15 14:47:48 -08:00
Morgan Bauer
99846a0b85
add newline to event json to match docker
...
- docker server has a newline separating individual json entries
- create const string for format
- resolves #1367
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-11-15 14:14:02 -08:00
Guillaume Hain
b384833401
Merge pull request #4 from kitematic/master
...
Merge master
2015-11-15 18:56:57 +01:00
Harald Albers
d411c47139
bash completion for docker {run,create} --volume-driver
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-11-15 09:53:22 -08:00
John Howard
7e5e29e415
Windows [TP4] Fix push to not kill daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-15 08:43:23 -08:00
Zhang Kun
82ba25bea9
fix doc
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
fix doc
Signed-off-by: Zhang Kun <zkazure@gmail.com >
2015-11-15 23:32:40 +08:00
Govinda Fichtner
b74fd0628a
Add initial support for Docker on ARM
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com >
2015-11-15 13:15:31 +01:00
Diogo Mónica
378888f6d7
Merge pull request #295 from docker/no-stderr-for-cmds
...
Set the default output for all cobra commands to be STDOUT
2015-11-15 13:12:36 +01:00
Diogo Mónica
4f347a1303
Merge pull request #296 from endophage/pretty_print_targets
...
headers were still printing when no targets were found
2015-11-15 13:12:29 +01:00
Tibor Vass
59fe485f0d
Merge pull request #17945 from tonistiigi/fix-windows-pull
...
Fix docker pull on windows
2015-11-15 12:32:25 +01:00
David Lawrence
d0b3bd2860
headers were still printing when no targets were found
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-11-15 02:48:33 -08:00
Ying Li
238ee32c78
Set the default output for all cobra commands to be STDOUT
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-11-15 02:46:29 -08:00
Ying Li
a05fee7469
Make vet target now also checks for filenames with _test_ in the middle.
...
Since if they are generic test helpers that should be exported,
they should probably go into their own package. If they are used
during testing, they should end in _test.
Signed-off-by: Ying Li <ying.li@docker.com >
2015-11-15 02:42:14 -08:00
Diogo Mónica
ebc41c8154
Merge pull request #292 from docker/fix-signer-sign
...
The NotarySigner cryptoservice now implements GetPrivateKey.
2015-11-15 11:33:32 +01:00
Diogo Mónica
04941d90a0
Merge pull request #289 from endophage/pretty_print_targets
...
pretty printing targets
2015-11-15 11:32:02 +01:00
Diogo Mónica
e638f0a4d6
Merge pull request #285 from docker/delete-key-is-back
...
Add an interactive command to delete a key from any keystore.
2015-11-15 11:31:41 +01:00
Ying Li
204a4f1534
The NotarySigner cryptoservice now implements GetPrivateKey.
...
Previously, because it's a CryptoService wrapper around a remote signer
service, it returned nil all the time. Now, because signing is done
via private key more than CryptoService, it has to return a PrivateKey.
The key doesn't have private bytes, but can be used for signing.
Signed-off-by: Ying Li <ying.li@docker.com >
2015-11-15 01:45:21 -08:00
Antonio Murdaca
7929888214
Remove deprecated cli flags
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2015-11-15 10:40:01 +01:00