David Calavera
ad41efd9a2
Bump libnetwork for 1.7 release.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-02 11:00:54 -07:00
David Calavera
814a92c5a1
Merge pull request #13607 from vieux/PrintfIfNotEmpty
...
do not print empty values in docker info
2015-06-02 10:52:45 -07:00
Sebastiaan van Stijn
bdb6fad34c
Merge pull request #13654 from porjo/netipv6
...
Networking docs: add reference to ndppd
2015-06-02 19:06:17 +02:00
Arnaud Porterie
2de2782fe8
Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled
...
Fix wrong kill signal parsing
2015-06-02 09:40:55 -07:00
Alexander Morozov
9f098cabfc
Merge pull request #13664 from runcom/dead-code
...
Remove old struct
2015-06-02 09:37:55 -07:00
Sebastiaan van Stijn
fbadf11d20
Merge pull request #13633 from ZJU-SEL/fix-doc
...
fix typo.
2015-06-02 18:36:52 +02:00
Antonio Murdaca
39eec4c25b
Fix wrong kill signal parsing
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com >
2015-06-02 18:01:19 +02:00
Vincent Batts
d13af493f8
Merge pull request #13630 from vdemeester/pkg-tarsum-test-coverage
...
Add test coverage for pkg/tarsum
2015-06-02 11:44:42 -04:00
Phil Estes
8a11b40fea
Merge pull request #13553 from Microsoft/10662-revert908db
...
Windows: Undo 908db518 for Windows daemon
2015-06-02 10:22:39 -04:00
Antonio Murdaca
da1a77defd
Remove old struct
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com >
2015-06-02 16:10:39 +02:00
James Turnbull
879f0fb338
Merge pull request #13657 from chriswahl/patch-1
...
Corrected VMWare to VMware
2015-06-02 07:41:25 -04:00
Vincent Demeester
25f7d7822d
Add test coverage for pkg/tarsum
...
And removing unused code.
- tarsum.go :
NewTarSumHash could be non exported (for now)
NewTarSumForLabel is never used, except for the tests
- fileinfosums.go:
SortByPos is never used, except for the tests
- versionning.go:
GetVersions is never used, expect for the tests
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-06-02 09:08:01 +02:00
Ian Bishop
b1a1cff368
Networking docs: add reference to ndppd
...
Signed-off-by: Ian Bishop <ianbishop@pace7.com >
2015-06-02 15:56:24 +10:00
Chris Wahl
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
He Simei
0d72772c37
fix typo.
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
2015-06-02 09:44:52 +08:00
Tibor Vass
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
moxiegirl
cd79751cfa
Merge pull request #13644 from mchiang0610/patch-1
...
Fix - Download button does not download
2015-06-01 17:33:38 -07:00
Arnaud Porterie
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
Jessie Frazelle
aa8d8fdc0c
Merge pull request #13611 from duglin/Issue13417a
...
Allow .dockerignore to ignore everything
2015-06-01 15:59:57 -07:00
Jessie Frazelle
1f472c3768
Merge pull request #13536 from Mic92/master
...
remove redundant mount/unmount calls on commit
2015-06-01 15:57:14 -07:00
Jessie Frazelle
f358b39521
Merge pull request #13597 from sanketsaurav/master
...
Proposing Bose, Raman and Ramanujan
2015-06-01 15:56:16 -07:00
Richard
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
Victor Vieux
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
Jessie Frazelle
488c355d94
Merge pull request #13643 from LK4D4/fix_registry_race
...
Fix race condition in registry/session
2015-06-01 14:44:12 -07:00
Alexander Morozov
b7101d528d
Merge pull request #13638 from icecrime/maintainers_add_calavera
...
Add @calavera to maintainers
2015-06-01 14:05:12 -07:00
Alexander Morozov
cd80a61cc1
Merge pull request #13443 from duglin/CleanupEvents
...
Cleanup container LogEvent calls
2015-06-01 14:04:33 -07:00
Michael Chiang
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
Alexander Morozov
9d98c28855
Fix race condition in registry/session
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-01 13:25:18 -07:00
David Calavera
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
Phil Estes
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
Doug Davis
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
Tonis Tiigi
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
Arnaud Porterie
62afcbc6d4
Add @calavera to maintainers
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-01 12:02:12 -07:00
Alexander Morozov
24fbcffeac
Merge pull request #13560 from Microsoft/10662-statscollector
...
Windows: Factor out stat collector
2015-06-01 11:39:19 -07:00
Brian Goff
d156bc9dd4
Merge pull request #13637 from LK4D4/remove_debug
...
Remove useless debug message
2015-06-01 11:38:05 -07:00
Alexander Morozov
f1b59d64d2
Remove useless debug message
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-01 11:15:15 -07:00
Brian Goff
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
David Calavera
6fb454b9f0
Merge pull request #13464 from davidrjenni/10184-fix-auto-created-devices
...
Fixes issue #10184 .
2015-06-01 09:30:04 -07:00
Phil Estes
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
moxiegirl
7c190b9556
Merge pull request #13523 from moxiegirl/carry-12572-fix
...
Updating after the pr went through
2015-06-01 09:21:12 -07:00
Mary Anthony
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
John Howard
68c879406b
Windows: Factor out stat collector
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-01 09:11:03 -07:00
Sebastiaan van Stijn
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
Brian Goff
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
Tobias Gesellchen
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
Sven Dowideit
4caa9392f8
Merge pull request #13622 from jogo/spelling
...
Fix spelling mistakes in documentation
2015-06-01 11:37:48 +10:00
Joe Gordon
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
moxiegirl
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
Jessie Frazelle
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
James Turnbull
73683e807d
Merge pull request #13616 from konstruktoid/docs_openssl
...
Docs: sha256 and 4096 when using openssl
2015-05-30 19:20:21 -04:00