55cea4952b
Corrected VMWare to VMware
...
Corrected spelling of VMware.
Signed-off-by: Chris Wahl <github@wahlnetwork.com>
2015-06-01 22:34:43 -05:00
e55649192e
test: Skip TestDevicePermissions on lxc
...
Closes : #13641
Signed-off-by: Zefan Li <lizefan@huawei.com>
2015-06-02 10:27:54 +08:00
0d72772c37
fix typo.
...
Signed-off-by: He Simei <hesimei@zju.edu.cn>
2015-06-02 09:44:52 +08:00
1f903f652c
Merge pull request #13651 from RichardScothern/v1-mirror-fix
...
Fallback to pull from hub if mirrors unavailable.
2015-06-01 21:09:54 -04:00
cd79751cfa
Merge pull request #13644 from mchiang0610/patch-1
...
Fix - Download button does not download
2015-06-01 17:33:38 -07:00
05b1d02423
Merge pull request #13609 from Microsoft/10662-refixserverwindows
...
Windows: Fix windows to match linux after compile break
2015-06-01 17:03:13 -07:00
65c5105fcc
Upon HTTP 302 redirect do not include "Authorization" header on 'untrusted' registries.
...
Refactoring in Docker 1.7 changed the behavior to add this header where as Docker <= 1.6 wouldn't emit this Header on a HTTP 302 redirect.
This closes #13649
Signed-off-by: Jeffrey van Gogh <jvg@google.com>
2015-06-01 16:12:56 -07:00
aa8d8fdc0c
Merge pull request #13611 from duglin/Issue13417a
...
Allow .dockerignore to ignore everything
2015-06-01 15:59:57 -07:00
1f472c3768
Merge pull request #13536 from Mic92/master
...
remove redundant mount/unmount calls on commit
2015-06-01 15:57:14 -07:00
f358b39521
Merge pull request #13597 from sanketsaurav/master
...
Proposing Bose, Raman and Ramanujan
2015-06-01 15:56:16 -07:00
6e4ff1bb13
If no endpoint could be established with the given mirror configuration,
...
fallback to pulling from the hub as per v1 behavior.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-06-01 15:18:56 -07:00
c790aa36ea
no not print empty keys in docker info
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-01 15:05:20 -07:00
488c355d94
Merge pull request #13643 from LK4D4/fix_registry_race
...
Fix race condition in registry/session
2015-06-01 14:44:12 -07:00
4fde1cb695
Fix stats flaky test.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-01 14:05:26 -07:00
b7101d528d
Merge pull request #13638 from icecrime/maintainers_add_calavera
...
Add @calavera to maintainers
2015-06-01 14:05:12 -07:00
cd80a61cc1
Merge pull request #13443 from duglin/CleanupEvents
...
Cleanup container LogEvent calls
2015-06-01 14:04:33 -07:00
5606f32eec
Fix - Download button does not download
...
Fix - Download button does not download
Users got confused when Kitematic is not being downloaded after clicking on the download button, and instead got brought to a screen to teach them how to download Kitematic.
The additional step caused a significant drop in Kitematic downloads. This pull request fixes the issue, to allow users to directly download Kitematic after clicking on the Download button.
Signed-off-by: Michael Chiang <michael.chiang@docker.com>
2015-06-01 13:29:44 -07:00
9d98c28855
Fix race condition in registry/session
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-01 13:25:18 -07:00
64a7431663
Merge pull request #13639 from tonistiigi/fix-git-escape
...
Make sure git remote subdirs don't escape git root
2015-06-01 13:04:39 -07:00
84413be3c9
Break down loadManifest function into constituent parts
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-06-01 13:02:50 -07:00
71d960d455
Merge pull request #13557 from ewindisch/apparmor-unshare-priv
...
Expand unshare test to include privileged test
2015-06-01 15:43:37 -04:00
8232312c1e
Cleanup container LogEvent calls
...
Move some calls to container.LogEvent down lower so that there's
less of a chance of them being missed. Also add a few more events
that appear to have been missed.
Added testcases for new events: commit, copy, resize, attach, rename, top
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-06-01 12:39:28 -07:00
7f7ebeffe8
Fix breakouts from git root during build
...
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com>
2015-06-01 22:10:55 +03:00
62afcbc6d4
Add @calavera to maintainers
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-06-01 12:02:12 -07:00
24fbcffeac
Merge pull request #13560 from Microsoft/10662-statscollector
...
Windows: Factor out stat collector
2015-06-01 11:39:19 -07:00
d156bc9dd4
Merge pull request #13637 from LK4D4/remove_debug
...
Remove useless debug message
2015-06-01 11:38:05 -07:00
f1b59d64d2
Remove useless debug message
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-01 11:15:15 -07:00
a7005c44b5
Merge pull request #13320 from coolljt0725/add_stats_no_stream_show_cpu_usage
...
Add docker stats --no-stream show cpu usage
2015-06-01 09:40:04 -07:00
6fb454b9f0
Merge pull request #13464 from davidrjenni/10184-fix-auto-created-devices
...
Fixes issue #10184 .
2015-06-01 09:30:04 -07:00
d37aad170f
Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental
...
fix release script for experimental
2015-06-01 12:29:45 -04:00
7c190b9556
Merge pull request #13523 from moxiegirl/carry-12572-fix
...
Updating after the pr went through
2015-06-01 09:21:12 -07:00
3ce2797541
Updating after the pr went through
...
Updating with comments.
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-01 09:20:31 -07:00
68c879406b
Windows: Factor out stat collector
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-01 09:11:03 -07:00
09bfbfd74e
Merge pull request #13615 from gesellix/docs-container-create-start
...
indicate HostConfig to be used for "create container"
2015-06-01 17:46:32 +02:00
b445004364
Merge pull request #13390 from mrjana/cnm_integ
...
Do not attempt releasing network when not attached to any network
2015-06-01 08:25:20 -07:00
16e649c589
indicate HostConfig to be used for "create container"
...
Closes #13614
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-06-01 07:04:41 +02:00
4caa9392f8
Merge pull request #13622 from jogo/spelling
...
Fix spelling mistakes in documentation
2015-06-01 11:37:48 +10:00
3d87b80b46
Fix spelling mistakes in documentation
...
While reading some of the docs I noticed a few errors, so I ran
misspellings (https://pypi.python.org/pypi/misspellings ) on markdown files
Signed-off-by: Joe Gordon <joe.gordon0@gmail.com>
2015-05-31 11:53:23 -07:00
093f57a261
Merge pull request #13460 from moxiegirl/add-created-state-diagram
...
Updating event diagram with the created state. Cool, thank you.
2015-05-30 19:47:24 -07:00
0ea14e5c6d
Merge pull request #13603 from tianon/consistent-dest
...
Make "DEST" a make.sh construct instead of ad-hoc
2015-05-30 16:42:10 -07:00
73683e807d
Merge pull request #13616 from konstruktoid/docs_openssl
...
Docs: sha256 and 4096 when using openssl
2015-05-30 19:20:21 -04:00
5cd64cb93f
aes256 and 4096 bits
...
squashing down to a single commit and change back to cert.pem
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-05-31 01:05:49 +02:00
ac3388367b
Make "DEST" a make.sh construct instead of ad-hoc
...
Using "DEST" for our build artifacts inside individual bundlescripts was already well-established convention, but this officializes it by having `make.sh` itself set the variable and create the directory, also handling CYGWIN oddities in a single central place (instead of letting them spread outward from `hack/make/binary` like was definitely on their roadmap, whether they knew it or not; sneaky oddities).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-30 11:16:43 -07:00
f2154a5a6b
Merge pull request #13367 from duglin/Issue13353
...
Add a "Created" state for new containers that haven't been run yet
2015-05-30 19:49:38 +02:00
96123a1fd5
Add docker stats --no-stream show cpu usage
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-31 01:25:51 +08:00
dc697b1c9f
Add a "Created" state for new containers that haven't been run yet
...
Closes #13353
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-30 07:48:46 -07:00
279c877451
Merge pull request #13580 from vdemeester/update-api-commit
...
Update api documentation to add labels in commit
2015-05-30 14:44:05 +02:00
18c11dc264
Merge pull request #13612 from duglin/DocsNewLine
...
Premature newline insertions
2015-05-30 08:33:46 -04:00
e51b311129
Premature newline insertions
...
Noticed that there were a few newlines in the middle of a \`...\` blocks that
made the text look funny when displayed in HTML.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-30 04:46:24 -07:00
82ea6ed2bc
Allow .dockerignore to ignore everything
...
Change CLI error msg because it was too specific and didn't make sense
when there were errors not related to inaccessible files.
Removed some log.Error() calls since they're not really errors we should
log. Returning the error will be enough.
Closes : #13417
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-30 04:16:00 -07:00
Chris Wahl
Zefan Li
He Simei
Tibor Vass
moxiegirl
Arnaud Porterie
Jeffrey van Gogh
Jessie Frazelle
Richard
Victor Vieux
David Calavera
Alexander Morozov
Michael Chiang
Alexander Morozov
Stephen J Day
Phil Estes
Doug Davis
Tonis Tiigi
Brian Goff
John Howard
Sebastiaan van Stijn
Tobias Gesellchen
Sven Dowideit
Joe Gordon
James Turnbull
Thomas Sjögren
Tianon Gravi
Lei Jitang