0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
15613 commits 14 branches 412 tags 338 MiB
Commit graph

15613 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sven Dowideit
82bd3886d5 Add Kitematic documentation to docs.master.docker.com 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-20 01:57:45 +00:00
Doug Davis
472538bee0 Merge pull request #13219 from brahmaroutu/gccgo_compile_issue 
fix to gccgo compilation error
 2015-05-18 20:43:47 -04:00
moxiegirl
6a18412d5b Merge pull request #13189 from alvinr/mongodb-fixup 
Fixup MongoDB changes to line up with MongoDB 3.0 release
 2015-05-18 15:22:41 -07:00
Doug Davis
dfc329d76a Merge pull request #13308 from lightsofapollo/issue-13307 
Increase default connection timeout to 30s
 2015-05-18 18:01:00 -04:00
James Lal
f5e6f50a1e Increase default connection timeout to 30s 
Closes #13307
Signed-off-by: James Lal <jlal@mozilla.com>
 2015-05-18 13:26:33 -07:00
Alvin Richards
3f37afe0b9 Bring MongoDB examples up to date with 3.0 release 
Signed-off-by: Alvin Richards <alvin.richards@docker.com>
 2015-05-18 13:08:31 -07:00
Michael Crosby
aac645ae04 Merge pull request #13282 from duglin/RemoveBash 
Remove use of 'bash' from our tests
 2015-05-18 13:06:21 -07:00
Brian Goff
ccf02a9f77 Merge pull request #13279 from hqhq/hq_use_inspectfield 
Use inspectField to simplify code
 2015-05-18 14:53:37 -04:00
Michael Crosby
785ba790fb Merge pull request #13204 from chenhanxiao/gitignore 
gitignore: add *.rej
 2015-05-18 11:51:06 -07:00
Tianon Gravi
0c375a779a Merge pull request #13244 from hqhq/hq_update_vendor_pty 
kr/pty: vendor upstream 5cf931ef8f
 2015-05-18 11:46:43 -07:00
Brian Goff
3b69ca5b97 Merge pull request #13277 from runcom/restartpolicy-methods 
RestartPolicy methods instead of strings checking
 2015-05-18 14:36:54 -04:00
Michael Crosby
70e9e4bf9f Merge pull request #13249 from coolljt0725/fix_incorrect_document_of_storage_opt 
Fix incorrect document storage-opt
 2015-05-18 11:35:01 -07:00
Doug Davis
3b1f73fbcd Remove use of 'bash' from our tests 
Not 100% sure why our Windows test don't complain about some of these,
I'm guessing it because we have bash as part of some git package, but
either way we really shouldn't require bash to run our tests unless we
really need to - which in these cases we don't

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-18 11:29:08 -07:00
Michael Crosby
fc4f3e5650 Merge pull request #13295 from aimxhaisse/13294-mflag-panic 
Fix panic when using default-initialized FlagSet
 2015-05-18 11:27:12 -07:00
Sebastiaan van Stijn
93825056d8 Merge pull request #13206 from draghuram/info_api_doc 
Bring /info API doc in line with the actual response.
 2015-05-18 20:20:57 +02:00
James Turnbull
8f8ee7d5c3 Merge pull request #12804 from ankushagarwal/configuring-docker 
Add CentOS/RHEL configuration to the config article
 2015-05-18 14:18:32 -04:00
Michael Crosby
aca4ae8c90 Merge pull request #13280 from runcom/test-clean-from-inspect 
Clean tests from not needed inspect call
 2015-05-18 11:06:18 -07:00
Michael Crosby
cbc122e8a7 Merge pull request #13306 from ahmetalpbalkan/logopts-context 
Pass --log-opts map to logdrivers
 2015-05-18 10:58:17 -07:00
Raghuram Devarakonda
9c0608565c Bring /info API doc in line with the actual response. 
The fix handles versions 1.18 and 1.19.

Closes #13139.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-05-18 13:55:42 -04:00
Ahmet Alp Balkan
8b11592d69 Pass -log-opts map to logdrivers 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-18 16:50:14 +00:00
Brian Goff
19ae59f910 Merge pull request #13283 from Microsoft/10662-fixbaselinenewdriver 
Windows: NewDriver() re-baseline parms
 2015-05-18 10:56:06 -04:00
s. rannou
e94bab8278 Fix panic when using default-initialized FlagSet 
Closes #13294

Signed-off-by: Sebastien Rannou <mxs@sbrk.org>
 2015-05-18 11:55:38 +02:00
Qiang Huang
74f8a4eca4 Use inspectField to simplify code 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-18 10:06:13 +08:00
Alexander Morozov
9c5635a2a0 Merge pull request #13284 from Microsoft/10662-compileconfigwindows 
Windows: Simple import error on config_windows.go
 2015-05-17 08:59:00 -07:00
Brian Goff
692b7b911e Merge pull request #13271 from Microsoft/10662-nounixsocket 
Windows: No unix_socket.go
 2015-05-16 21:34:15 -04:00
Jessie Frazelle
48b4229cb4 Merge pull request #13239 from Microsoft/10662-hack 
Make which cross binary fails clearer
 2015-05-17 01:09:36 +03:00
John Howard
dfddfa6bb8 Windows: Simple import error on config_windows.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-16 12:18:55 -07:00
John Howard
50b4079b5f Windows: NewDriver() re-baseline parms 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-16 11:38:19 -07:00
Sebastiaan van Stijn
a9172f572e Merge pull request #13281 from mavenugo/plugin_typo 
Fixing a Typo in plugins mime-type
 2015-05-16 19:52:57 +02:00
Antonio Murdaca
a268e36719 Clean tests from not needed inspect call 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-16 18:12:54 +02:00
Alexander Morozov
b5e932a3bf Merge pull request #13237 from ahmetalpbalkan/tag/event 
Introduce daemon event 'tag' upon image tagging
 2015-05-16 09:05:03 -07:00
Madhu Venugopal
215a5ebdb6 Fixing a Typo in plugins mime-type 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-05-16 08:49:23 -07:00
Antonio Murdaca
624bf81fdb Add RestartPolicy methods instead of using strings checking 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-16 14:15:28 +02:00
Antonio Murdaca
42cfc95549 Merge pull request #13273 from HuKeping/remove-deadcode 
Cleanup dead code of integration-cli/utils.go
 2015-05-16 14:03:42 +02:00
Hu Keping
35b4ed4d17 Remove dead code of integration-cli/utils.go 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-16 16:49:55 +08:00
Michael Crosby
115b11ae69 Merge pull request #13222 from calavera/plugins_infra 
Remote plugins plumbing.
 2015-05-15 16:37:55 -07:00
John Howard
6c187b8b4b Windows: No unix_socket.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-15 15:49:02 -07:00
Madhu Venugopal
ba3bcf0537 Allow to call back when a plugin is loaded. 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-05-15 13:50:44 -07:00
Ahmet Alp Balkan
1630ed97ac Introduce daemon event 'tag' upon image tagging 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-15 20:21:59 +00:00
Alexander Morozov
27b77464d8 Merge pull request #13232 from Microsoft/10662-zfs 
Windows: No ZFS graphdriver
 2015-05-15 11:51:48 -07:00
Alexander Morozov
0db7365c66 Merge pull request #13221 from duglin/ReenableDebug 
add link between -D and --log-level=debug back in
 2015-05-15 11:45:44 -07:00
David Calavera
b785e5091f Merge pull request #13086 from shishir-a412ed/docker_root_execdriver 
root dir for execdriver (/var/run/docker) should be configurable
 2015-05-15 11:16:12 -07:00
Alexander Morozov
88127ce475 Merge pull request #13246 from unclejack/refactor_statscollector 
daemon/stats_collector: refactor getSystemCpuUsage
 2015-05-15 11:06:47 -07:00
David Calavera
839d64ffb1 Remote plugins plumbing. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-15 11:04:58 -07:00
Michael Crosby
520955b1cf Merge pull request #13236 from vieux/revert_time_change 
Revert "Fix inconsistent date formats in API"
 2015-05-15 10:32:03 -07:00
John Howard
0bdeef94c7 Make which cross binary fails clearer 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-15 09:25:13 -07:00
Alexander Morozov
5d2ef30a38 Merge pull request #13251 from cpuguy83/13233_fix_log_follow_goroutine_check 
Extend sleep/timeout for ngoroutine check
 2015-05-15 08:57:25 -07:00
Brian Goff
248e5a4c83 Merge pull request #13220 from Microsoft/10662-sysinfo 
Windows: Refactor sysinfo for compilation
 2015-05-15 10:53:55 -04:00
Brian Goff
2c8eba14df Merge pull request #13243 from coolljt0725/remove_redundant_log 
Cleanup:Remove redundant log in pkg/pidfile/pidfile.go
 2015-05-15 10:13:19 -04:00
Brian Goff
f207322c0a Extend sleep/timeout for ngoroutine check 
In cases where this is failing it's ok to have the test take extra time,
but we don't want it to fail because of some race/performance
differences between systems.
So make the timeout go to 30s and double the sleep time in between
checks so it's not pounding the daemon quite so fast.

Originally I couldn't make this test fail (pre-change), but changed
graphdrivers and saw a failure pretty quickly.
This change seems to smooth that out.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-15 09:54:43 -04:00