1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

21862 commits

Author SHA1 Message Date
Aaron Lehmann
4d437a29d2 Vendor updated distribution for resumable downloads
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-04 17:33:37 -08:00
Alexander Morozov
69c381c8d1 Merge pull request from aboch/vnd
Vendoring libnetwork 0.6.0-rc6
2016-02-01 08:32:02 -08:00
Brian Goff
967848419a Merge pull request from HackToday/refactorfs
Make btrfs call same interface as others
2016-02-01 10:36:59 -05:00
Sebastiaan van Stijn
c2d6831fc4 Merge pull request from Microsoft/10662-TestBuildCI2
Second set of enabling TestBuild CI for Windows
2016-02-01 16:29:52 +01:00
Vincent Demeester
ec67c8c4b6 Merge pull request from Microsoft/jjh/disableunreliabletests
Windows CI: Turn off unreliable TP4 tests
2016-02-01 13:50:26 +01:00
Sebastiaan van Stijn
179cd3e8bc Merge pull request from vdemeester/add-ipfs-volume-plugin
Add docker-volume-ipfs plugin to the list.
2016-02-01 13:41:19 +01:00
Vincent Demeester
b01886a556 Add docker-volume-ipfs plugin to the list.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-02-01 13:30:15 +01:00
Vincent Demeester
63335df3d4 Merge pull request from quofelix/master
Added link to Quobyte's volume plugin.
2016-02-01 13:10:17 +01:00
Felix Hupfeld
518c20787b Added link to Quobyte's volume plugin.
Signed-off-by: Felix Hupfeld <felix@quobyte.com>
2016-02-01 12:51:05 +01:00
Lei Jitang
743978e3ba Merge pull request from Qiaohai8866/master
change 'host:port' to `host:port`
2016-02-01 18:47:14 +08:00
qg
7d1018545f change 'host:port' to host:port
Signed-off-by: Gang Qiao <qiaohai8866@gmail.com>
2016-02-01 17:22:16 +08:00
Kai Qiang Wu(Kennan)
feda5d7684 Make btrfs call same interface as others
Most storage drivers call graphdriver.GetFSMagic(home),
it is more clean to easy to maintain. So btrfs need to
adopt such change.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-01 07:50:21 +00:00
Antonio Murdaca
0f124979c2 Merge pull request from ZhuWeiyang/fix-ubuntulinux-upgrade
Fix upgrade command in ubuntulinux
2016-02-01 07:11:40 +01:00
Weiyang Zhu
a80c404cc6 Fix upgrade command
Signed-off-by: Weiyang Zhu <cnresonant@gmail.com>
2016-02-01 12:59:21 +08:00
John Howard
59f4369f1a Windows CI: Turn off unreliable TP4 tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-31 15:51:56 -08:00
Sebastiaan van Stijn
40ce2574b4 Merge pull request from pra85/patch-1
Fix typo
2016-01-31 22:58:19 +01:00
Prayag Verma
86beb6e27e Fix typo
Signed-off-by: Prayag Verma <prayag.verma@gmail.com>
2016-02-01 01:25:59 +05:30
Sebastiaan van Stijn
6f86bcee76 Merge pull request from moxiegirl/carry-close-19240
Updating for CAS changes and new select a driver section
2016-01-31 15:52:14 +01:00
Alessandro Boch
f943fd7d24 Vendoring libnetwork 0.6.0-rc6
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-30 20:03:03 -08:00
Nigel
89923c1f32 Updating for CAS changes and new select a driver section
Adding changes requested by @jamtur01 and wrapping to 80 chars
Adding typo fixes and replacing tabs with 4xspaces
Closes and fixes 
Updating with content addressable storage model changes

Signed-off-by: Nigel <nigelpoulton@hotmail.com>
2016-01-30 18:03:04 -08:00
Antonio Murdaca
5f5a752bcf Merge pull request from Microsoft/jjh/revert19790
Revert PR 19790 (breaks windowsTP4 CI on cache bust)
2016-01-30 20:28:21 +01:00
Sebastiaan van Stijn
d069e8e7b7 Merge pull request from shin-/remote_api_container_update_doc
Update example request for container update in docs.
2016-01-30 08:05:55 -08:00
Brian Goff
d695cf8de7 Merge pull request from runcom/remove-redunant-function
cleanup and move stuff where needed
2016-01-30 10:12:38 -05:00
Doug Davis
80c7258e11 Merge pull request from WeiZhang555/warn-info
Change log level
2016-01-30 09:58:47 -05:00
Antonio Murdaca
667c2245ad Merge pull request from Microsoft/jjh/testexecapi
Windows CI: Port TestExecApi* tests
2016-01-30 11:50:01 +01:00
Vincent Demeester
6b57380173 Merge pull request from nishanttotla/19277-CustomInfoField
Display SystemStatus field in docker info
2016-01-30 11:48:01 +01:00
Antonio Murdaca
98ef10f64e Merge pull request from Microsoft/jjh/testevents
Windows CI: Porting TestEvents*
2016-01-30 11:47:44 +01:00
Zhang Wei
98f74f8383 Change log level
Warning should be printed with real `logrus.Warn`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-30 18:46:16 +08:00
Sebastiaan van Stijn
317c89ce9e Merge pull request from brahmaroutu/fix_notary_gccgo_s390x
Need -lpthread to compile Notary
2016-01-29 22:33:57 -08:00
John Howard
54320d8d18 Signed-off-by: John Howard <jhoward@microsoft.com>
Revert "Combine SetupWorkingDirectory for Linux and Windows"

This reverts commit ec31741ca1.
2016-01-29 20:49:39 -08:00
Brian Goff
0c09dda80f Merge pull request from aaronlehmann/compress-panic
Fix panic on network timeout during push
2016-01-29 22:15:13 -05:00
Joffrey F
5f0643b082 Update example request for container update in docs.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-29 18:35:29 -08:00
Brian Goff
9c3cca23e9 Merge pull request from Microsoft/jjh/testruncreatevolumesinsymlinkdir
Fix TestRunCreateVolumesInSymlinkDir
2016-01-29 21:07:51 -05:00
Brian Goff
c8fb886dba Merge pull request from Microsoft/jjh/maximus5
Improvements to ANSI emulation in conemu
2016-01-29 21:07:22 -05:00
Nishant Totla
6c5e8dd4c2 Adding SystemStatus field for /info endpoint
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-01-29 16:26:43 -08:00
Jess Frazelle
c006c02611 Merge pull request from jfrazelle/add-repo-scripts
add scripts to clean experimental rpms and debs
2016-01-29 15:52:18 -08:00
Aaron Lehmann
e273445dd4 Fix panic on network timeout during push
`Upload` already closes the reader returned by `compress` and the
progressreader passed into it, before returning. But even so, the
io.Copy inside compress' goroutine needs to attempt a read from the
progressreader to notice that it's closed, and this read has a side
effect of outputting a progress message. If this happens after `Upload`
returns, it can result in a write to a closed channel. Change `compress`
to return a channel that allows the caller to wait for its goroutine to
finish before freeing any resources connected to the reader that was
passed to it.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-29 14:34:50 -08:00
Arnaud Porterie
46018c3cee Merge pull request from cpuguy83/carry_19085
Carry 19085 -- Improve & cleanup documentation comments
2016-01-29 14:30:25 -08:00
Jess Frazelle
e23f24bbbd Merge pull request from hypriot/17802-build-first-debian-package-for-arm
add support for building first ARM-based debian package
2016-01-29 13:26:20 -08:00
David Calavera
35ef3efe9a Merge pull request from WeiZhang555/test-inspect
Make test code consistent
2016-01-29 12:43:58 -08:00
John Howard
bf33742026 Windows CI: Porting TestEvents*
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-29 12:33:56 -08:00
Brian Goff
9c09a79ba5 update doc string
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-29 15:25:25 -05:00
David Calavera
d38cee5e0d Merge pull request from tophj-ibm/update-registry-on-dockerfile-ppc64le
Update registry version in Dockerfile.ppc64le
2016-01-29 11:53:42 -08:00
Srini Brahmaroutu
6b09413f6b Need -lpthread to compile Notary
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2016-01-29 19:52:39 +00:00
Sebastiaan van Stijn
cfa547922d Merge pull request from wenchma/name_to_id_for_stats
Change container name to id as actual results
2016-01-29 10:58:42 -08:00
David Calavera
ca48f7350c Merge pull request from liusdu/forbid-null-login
forbid login of a null-string username
2016-01-29 10:34:16 -08:00
David Calavera
7cc012333f Merge pull request from jfrazelle/update-completions-for-disable-content-trust
update bash completions for push and pull
2016-01-29 10:29:59 -08:00
Jessica Frazelle
c40f487c5c
update bash completions for push and pull
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-29 10:14:36 -08:00
John Howard
90b0292b5b Fix TestRunCreateVolumesInSymlinkDir
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-29 09:28:48 -08:00
Zhang Wei
62a856e912 Assert error in body of function inspectField*
1. Replace raw `docker inspect -f xxx` with `inspectField`, to make code
cleaner and more consistent
2. assert the error in function `inspectField*` so we don't need to
assert the return value of it every time, this will make inspect easier.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-29 23:39:07 +08:00