5ce5df9c4d
Update vendoring
...
Update libnetwork to 005bc475ee49a36ef2ad9c112d1b5ccdaba277d4
Synchronize changes to distribution (was missing _test.go file)
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 1664d6cd66c48dce5628cb67c1bdf5c7c2395d53
Component: engine
2015-06-02 16:41:02 -07:00
3c84994047
Merge pull request #13675 from runcom/13663-config-regression
...
Expose old config field for api < 1.19
Upstream-commit: af09b06dfa7caa888e8f8f8c85a9da8b3ab20255
Component: engine
2015-06-02 15:23:51 -07:00
5276323624
Expose old config field for api < 1.19
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6deaa58ba5f051039643cedceee97c8695e2af74
Component: engine
2015-06-02 23:37:59 +02:00
0fb31101e8
Merge pull request #12838 from fntlnz/test-cmd
...
Using dockerCmd when possible
Upstream-commit: 6c42b3947a6ad91fc487ba34fec634e9f5c48aea
Component: engine
2015-06-02 14:12:22 -07:00
91a00ec5ad
Merge pull request #13591 from kvasdopil/update-go-zfs
...
Update go-zfs to last version
Upstream-commit: 3f26066425a308407054303e9e12ba1c1c743552
Component: engine
2015-06-02 14:05:29 -07:00
fc9089bc0b
Merge pull request #13661 from vdemeester/pkg-jsonmessage-test-coverage
...
Add test coverage to pkg/jsonmessage
Upstream-commit: da255ec962e26491baceffdc230fac3561396ff8
Component: engine
2015-06-02 16:54:50 -04:00
afac38e4c5
Merge pull request #13671 from moxiegirl/carry-13147-fix
...
Tweaking text identified in PR #13147
Upstream-commit: 7e8639a9df29571e7c4d922715a55bb4f1dcddf2
Component: engine
2015-06-02 21:48:47 +02:00
21fa65b4fd
Tweaking text identified in PR #13147
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: cb4af853f62d1e615f5d5ba62139ad5ed7bed5d5
Component: engine
2015-06-02 12:44:47 -07:00
29754ab635
Add test coverage to pkg/jsonmessage
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e6bd8c1e19f62fd3d09df37cd1712fd7e96bba89
Component: engine
2015-06-02 21:19:38 +02:00
bd2c53758a
Merge pull request #13668 from calavera/bump_libnetwork
...
Bump libnetwork for 1.7 release.
Upstream-commit: 63b5d5fadc9fa6ac9dd93c8553030d84e7ac741f
Component: engine
2015-06-02 15:04:38 -04:00
01c69f98c5
Update libnetwork to 4ded6fe3641b71863cc5985652930ce40efc3af4
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ad244668c3db521626e65fd9c2a4468f35a7b0bc
Component: engine
2015-06-02 11:30:36 -07:00
3494783c1d
Merge pull request #13650 from jvgogh/master
...
Upon HTTP 302 redirect do not include "Authorization" header on 'untr…
Upstream-commit: 278798236bdf073dd7c66e32e21d81bbf9243656
Component: engine
2015-06-02 14:23:20 -04:00
49338919a2
Merge pull request #13576 from stevvooe/verify-digests
...
Properly verify manifests and layer digests on pull
Upstream-commit: 274baf70bf806678d12adc1e1de2c8d7774de645
Component: engine
2015-06-02 11:16:23 -07:00
85f67e34a6
Merge pull request #13656 from lizf-os/13641-skip-test-on-lxc
...
test: Skip TestDevicePermissions on lxc
Upstream-commit: 7d33bc0bec14cedff0829a3e77c029c875413ec0
Component: engine
2015-06-02 11:05:22 -07:00
0ec0ea6ec1
Bump libnetwork for 1.7 release.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ad41efd9a271998620e04602ade71a94b4b0e7e4
Component: engine
2015-06-02 11:00:54 -07:00
7eb8a02dc4
Merge pull request #13607 from vieux/PrintfIfNotEmpty
...
do not print empty values in docker info
Upstream-commit: 814a92c5a1745879156ac9ab18569a9d1bc1b1a9
Component: engine
2015-06-02 10:52:45 -07:00
e427ed126a
Merge pull request #13654 from porjo/netipv6
...
Networking docs: add reference to ndppd
Upstream-commit: bdb6fad34cba055c6c7d58851c96dba485e10216
Component: engine
2015-06-02 19:06:17 +02:00
35a3ad8b0c
Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled
...
Fix wrong kill signal parsing
Upstream-commit: 2de2782fe89cf2793e868161985a3d7f764520df
Component: engine
2015-06-02 09:40:55 -07:00
e369cfae8c
Merge pull request #13664 from runcom/dead-code
...
Remove old struct
Upstream-commit: 9f098cabfc92db90ff66d9a1b318c0b5872edcbd
Component: engine
2015-06-02 09:37:55 -07:00
505be591f7
Merge pull request #13633 from ZJU-SEL/fix-doc
...
fix typo.
Upstream-commit: fbadf11d209496f847b3ecb6ce7e947cbf4f2621
Component: engine
2015-06-02 18:36:52 +02:00
66c03ea423
Fix wrong kill signal parsing
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com >
Upstream-commit: 39eec4c25bce6291534f9524dc52de65787d5b6e
Component: engine
2015-06-02 18:01:19 +02:00
0382da62a7
Merge pull request #13630 from vdemeester/pkg-tarsum-test-coverage
...
Add test coverage for pkg/tarsum
Upstream-commit: d13af493f8fbd3a48b52d24b62aa4c5923053186
Component: engine
2015-06-02 11:44:42 -04:00
b10110ca89
Merge pull request #13553 from Microsoft/10662-revert908db
...
Windows: Undo 908db518 for Windows daemon
Upstream-commit: 8a11b40fea38c97779ec6f25dcd279ec92300b53
Component: engine
2015-06-02 10:22:39 -04:00
495ecb3fef
Remove old struct
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com >
Upstream-commit: da1a77defd765b5caf3336825292e1ecd8a7d320
Component: engine
2015-06-02 16:10:39 +02:00
cc73e192db
Merge pull request #13657 from chriswahl/patch-1
...
Corrected VMWare to VMware
Upstream-commit: 879f0fb3387c367b6e26a48bb8fb4d285296c2d6
Component: engine
2015-06-02 07:41:25 -04:00
e864b04bef
update go-zfs to last version
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
Upstream-commit: ea5ce2756494d802f45e85224ce1a05939557d03
Component: engine
2015-06-02 10:37:38 +03:00
cdc521a53d
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 >
Upstream-commit: 25f7d7822d2b858864b03ea5dfc534c32c67326b
Component: engine
2015-06-02 09:08:01 +02:00
0f40ba9a23
Networking docs: add reference to ndppd
...
Signed-off-by: Ian Bishop <ianbishop@pace7.com >
Upstream-commit: b1a1cff368e7b7e4c6ad198cf53561d4edf50d38
Component: engine
2015-06-02 15:56:24 +10:00
dfd6d9f6bd
Corrected VMWare to VMware
...
Corrected spelling of VMware.
Signed-off-by: Chris Wahl <github@wahlnetwork.com >
Upstream-commit: 55cea4952bcc8bb5d2a8de9a3a303427f5f2692d
Component: engine
2015-06-01 22:34:43 -05:00
93fe2d99ac
test: Skip TestDevicePermissions on lxc
...
Closes : #13641
Signed-off-by: Zefan Li <lizefan@huawei.com >
Upstream-commit: e55649192ef9c947e9c90018c71bbc0a8d99a546
Component: engine
2015-06-02 10:27:54 +08:00
32a8861dca
fix typo.
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Upstream-commit: 0d72772c372dd2267211a92975ede20f5ac3cb3c
Component: engine
2015-06-02 09:44:52 +08:00
46b7d97a6b
Merge pull request #13651 from RichardScothern/v1-mirror-fix
...
Fallback to pull from hub if mirrors unavailable.
Upstream-commit: 1f903f652cd7e897c7adbbb0116a9e08d8552987
Component: engine
2015-06-01 21:09:54 -04:00
d43db5f8e1
Merge pull request #13644 from mchiang0610/patch-1
...
Fix - Download button does not download
Upstream-commit: cd79751cfa8d2554923d0cf29216504d660b0a70
Component: engine
2015-06-01 17:33:38 -07:00
f6a914544f
Merge pull request #13609 from Microsoft/10662-refixserverwindows
...
Windows: Fix windows to match linux after compile break
Upstream-commit: 05b1d02423179a32d9fed4f786af125054caec4c
Component: engine
2015-06-01 17:03:13 -07:00
4475beb8ff
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 >
Upstream-commit: 65c5105fcca76c34335f689336a663c78786fd9c
Component: engine
2015-06-01 16:12:56 -07:00
25eb4c5026
Merge pull request #13611 from duglin/Issue13417a
...
Allow .dockerignore to ignore everything
Upstream-commit: aa8d8fdc0cfe07ce4e4976dc41a3fdb86ebcfc66
Component: engine
2015-06-01 15:59:57 -07:00
07eda82273
Merge pull request #13536 from Mic92/master
...
remove redundant mount/unmount calls on commit
Upstream-commit: 1f472c37687fd1f66e574df3ba773fde5be57e2d
Component: engine
2015-06-01 15:57:14 -07:00
ab7b79c3a9
Merge pull request #13597 from sanketsaurav/master
...
Proposing Bose, Raman and Ramanujan
Upstream-commit: f358b39521db8ea2836b3df1b2cb9df41534f42a
Component: engine
2015-06-01 15:56:16 -07:00
8ce2553351
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 >
Upstream-commit: 6e4ff1bb13c82fd530b27c85ae9b0ca476cddfcd
Component: engine
2015-06-01 15:18:56 -07:00
a8436a9c51
no not print empty keys in docker info
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: c790aa36ea92799593fe4b32fc516784eb0c2c43
Component: engine
2015-06-01 15:05:20 -07:00
877a921af1
Merge pull request #13643 from LK4D4/fix_registry_race
...
Fix race condition in registry/session
Upstream-commit: 488c355d9499fd1b8b24d8ec3a8004475c095ffa
Component: engine
2015-06-01 14:44:12 -07:00
f85b8fb4db
Merge pull request #13638 from icecrime/maintainers_add_calavera
...
Add @calavera to maintainers
Upstream-commit: b7101d528de3952754246b62596ac7a4bb3b3349
Component: engine
2015-06-01 14:05:12 -07:00
85e6643580
Merge pull request #13443 from duglin/CleanupEvents
...
Cleanup container LogEvent calls
Upstream-commit: cd80a61cc1dd6868eef77852b898f1d25c06641b
Component: engine
2015-06-01 14:04:33 -07:00
912b96c23e
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 >
Upstream-commit: 5606f32eecc1c9befde331ecc5b653ee4423d020
Component: engine
2015-06-01 13:29:44 -07:00
a965e4e763
Fix race condition in registry/session
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 9d98c28855035ba1a968f2031f50302d0c41e208
Component: engine
2015-06-01 13:25:18 -07:00
869144dea2
Merge pull request #13639 from tonistiigi/fix-git-escape
...
Make sure git remote subdirs don't escape git root
Upstream-commit: 64a74316634b75dd406673ebaba15eb2bbd96d11
Component: engine
2015-06-01 13:04:39 -07:00
e03ebf99d3
Break down loadManifest function into constituent parts
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 84413be3c9f908c08f79e3080d9a74fb8ad34505
Component: engine
2015-06-01 13:02:50 -07:00
fcc50c1993
Merge pull request #13557 from ewindisch/apparmor-unshare-priv
...
Expand unshare test to include privileged test
Upstream-commit: 71d960d4559cdbae4ff7913441685f29279a1ca2
Component: engine
2015-06-01 15:43:37 -04:00
4f79291859
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 >
Upstream-commit: 8232312c1e705753d3db82dca3d9bb23e59c3b52
Component: engine
2015-06-01 12:39:28 -07:00
c5eb072fd3
Fix breakouts from git root during build
...
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 7f7ebeffe81760e2e0a711eb480dd0e0e8cf24dc
Component: engine
2015-06-01 22:10:55 +03:00
