36d995a291
Merge pull request #11965 from duglin/DEBUG
...
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
2015-05-12 18:24:04 -07:00
3985f17812
Merge pull request #13131 from Microsoft/10662-loadonwindows
...
Windows: Build load.go
2015-05-12 18:04:33 -07:00
ec4baad954
Merge pull request #13166 from runcom/small-streamformatter-refactor
...
Refactor pkg/stremformatter - custom constructors
2015-05-12 20:28:18 -04:00
df89008f0c
Merge pull request #13099 from Microsoft/10662-pkgparsers
...
Windows: Implement parsers:kernel+os
2015-05-12 16:07:43 -07:00
6b700bdaca
Refactor pkg/stremformatter with custom constructors instead of passing a boolean
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-13 00:09:41 +02:00
f7ae2a372d
Windows: Impl pkg\parsers kernel+os
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-12 14:41:02 -07:00
aed8f9f76e
Windows: Build load.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-12 14:26:57 -07:00
37cb2a15bf
Merge pull request #13040 from cpuguy83/13014_fix_goroutine_leak_on_logs_follow
...
Make sure log pipes are closed
2015-05-12 13:52:49 -07:00
cb53a628b0
Merge pull request #13136 from Microsoft/10662-factoroutresolveconf
...
Windows: Don't pull in all of resolvconf
2015-05-12 13:49:47 -07:00
e0777e69cb
Merge pull request #13162 from jfrazelle/add-modprobe-br_netfilter
...
modprobe br_netfilter
2015-05-12 13:46:34 -07:00
f35038dfba
Merge pull request #13160 from runcom/remove-api-codepath-less-than-1-12
...
Remove API codepaths < 1.12
2015-05-12 13:08:36 -07:00
b0518fe038
Merge pull request #12847 from cpuguy83/fix_firewald_errors
...
Fix error message on firewalld init
2015-05-12 12:01:59 -07:00
4800d4df8c
this fixes hairpin nat tryinng to ping a the host and port from inside a container
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-12 11:57:36 -07:00
73387bf15a
Merge pull request #13105 from duglin/FixRunOutput
...
Fix RUN err msg (again)
2015-05-12 11:36:55 -07:00
5bf2ebf0a5
Merge pull request #13127 from shishir-a412ed/exec_opt_doc
...
Missing exec-opt[] option in CommandLine docs
2015-05-12 11:34:51 -07:00
7284b08204
Remove API codepaths < 1.12
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-12 20:09:49 +02:00
d4eba30065
Merge pull request #13141 from vieux/fallback_inspect
...
fallback to interface with docker inspect
2015-05-12 11:02:06 -07:00
445afe0977
Merge pull request #13151 from Mic92/master
...
zfs: update filesystem cache on filesystem creation/deletion
2015-05-12 10:53:01 -07:00
e3ba3dd5b8
Make sure log pipes are closed
...
Pipes are still not closed (and goroutines leaked) if neither pipe is
used.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-12 13:50:51 -04:00
c9821d8dd6
Merge pull request #13150 from hqhq/hq_remove_warn
...
Remove redundant warning
2015-05-12 10:32:01 -07:00
3b13e56fd7
Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup
...
Refactor server to use the daemon as a service
2015-05-12 10:27:43 -07:00
d0459abe6e
Merge pull request #12362 from ahmetalpbalkan/logs/since
...
Add --since argument to docker logs cmd
2015-05-12 09:40:16 -04:00
2cb23527e4
zfs: update filesystem cache on filesystem creation/deletion
...
Previously the cache was only updated once on startup, because the graph
code only check for filesystems on startup. However this breaks the API as it
was supposed and so unit tests.
Fixes #13142
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-05-12 13:06:41 +02:00
a8250a0b20
Remove redundant warning
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-12 18:02:30 +08:00
a5007e5737
Merge pull request #10786 from estesp/add-goroutine-debug
...
Add capability for goroutine dumping on SIGQUIT/USR1
2015-05-11 21:20:44 -04:00
52c3bb6a0e
fallback to interface with docker inspect
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-11 17:39:21 -07:00
95fcf76cc6
Add SIGUSR1 handler for dumping stack/goroutine traces
...
Add handler for SIGUSR1 based on feedback regarding when to dump
goroutine stacks. This will also dump goroutine stack traces on SIGQUIT
followed by a hard-exit from the daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-05-12 10:09:23 +10:00
e7568ed227
Merge pull request #9411 from Mic92/features/zfs-rebased
...
zfs-utils based zfs graph driver
2015-05-11 16:53:17 -07:00
c49695f976
Merge pull request #13137 from SvenDowideit/need-more-sudo
...
Need more sudo
2015-05-12 09:07:55 +10:00
c5e93d0950
Need more sudo
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-05-11 23:07:22 +00:00
78604a9f3f
Windows: Don't pull in all of resolvconf
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-11 15:28:08 -07:00
34b9769538
Merge pull request #13134 from SvenDowideit/dhe-1.0.1-release
...
DHE 1.0.1 release
2015-05-12 07:34:30 +10:00
38af208da1
DHE 1.0.1 release
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-05-11 21:23:56 +00:00
a47fb5edca
Merge pull request #13132 from LK4D4/fix_race_kill
...
Fix race between execdriver.Kill and execdriver.Run
2015-05-11 14:01:07 -07:00
ca7219f5da
Fix race between execdriver.Kill and execdriver.Run
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-05-11 13:23:50 -07:00
8cc93856e3
Merge pull request #13074 from runcom/11824-short-link-if-equals-alias
...
Allow links to be specified with only the name if it matches the alias
2015-05-11 13:18:29 -07:00
c6e6223ed7
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-11 21:50:47 +02:00
98277f3cad
Missing exec-opt[] option in CommandLine docs
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-05-11 15:41:50 -04:00
e66ad40c4e
Merge pull request #12994 from Microsoft/10662-fixinvocation
...
Windows: Fix builder\dispatchers.go
2015-05-11 11:24:43 -07:00
e2acca67c8
Move container.WaitStop, AttachWithLogs and WsAttachWithLogs to daemon service in api server
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-11 19:56:41 +02:00
5e063326a3
Merge pull request #13101 from bharaththiruveedula/13092-remove-unwanted-locks
...
Removing extra locks for Pause and Unpause functions
2015-05-11 10:54:39 -07:00
92344602ea
Merge pull request #13091 from LK4D4/generate_caps
...
Generate caps
2015-05-11 10:42:59 -07:00
cb9a6b9aed
Add --since argument to docker logs cmd
...
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.
Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-10 20:42:14 +00:00
4d6720bfbb
Merge pull request #13111 from gianlucaborello/fix-mac-documentation
...
Correctly document MAC address generation
2015-05-10 13:43:27 -04:00
13064646a6
Merge pull request #13102 from duglin/MissingOK
...
Add missing "ok" on "comma ok" idiom in test util
2015-05-10 09:22:44 -07:00
e324f51e5b
Default MAC address generation is not random and should be stated in the documentation.
...
Signed-off-by: Gianluca Borello <g.borello@gmail.com>
2015-05-10 08:11:26 -07:00
8c1ef5ceaf
Removing extra locks for Pause and Unpause functions
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com>
2015-05-10 00:16:54 +05:30
340fd140e6
Merge pull request #12988 from Mashimiao/remove-unused-container-functions
...
cleanup: remove unneeded locks
2015-05-09 09:42:27 -07:00
c5710c7318
Merge pull request #13093 from tianon/writeflusher
...
Move WriteFlusher out of utils into ioutils
2015-05-09 09:39:17 -07:00
61cb6012e6
Merge pull request #13095 from Microsoft/10662-pkgrexec
...
Windows: reexec pkg supported
2015-05-09 09:38:42 -07:00
Jessie Frazelle
Tibor Vass
Brian Goff
Antonio Murdaca
John Howard
Michael Crosby
Alexander Morozov
Jessica Frazelle
Sebastiaan van Stijn
Jörg Thalheim
Qiang Huang
Victor Vieux
Phil Estes
Sven Dowideit
Sven Dowideit
Alexander Morozov
Shishir Mahajan
Ahmet Alp Balkan
Gianluca Borello
Bharath Thiruveedula