a5879bb83b
Windows: [TP4] Add CPU Weight
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-22 18:29:15 -07:00
7acd3ca79d
Add README for pluginrpc-gen
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-22 19:34:44 -04:00
b0dc11127e
Merge pull request #16328 from jfrazelle/opensuse-rpms
...
add opensuse to rpm builder
2015-09-22 15:59:49 -07:00
14e8949dcf
Merge pull request #16492 from albers/completion-compopt-mac
...
[Fix 16348] Bash completion: avoid 'compopt: command not found' errors on Mac OS
2015-09-22 15:58:56 -07:00
9dc0973655
Merge pull request #16331 from calavera/server_middlewares
...
Organize server pre-func logic in middlewares.
2015-09-22 16:10:42 -05:00
dc17613297
Do not hardcode http as plugin URL scheme for secure connections.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-22 15:54:29 -04:00
04d76d898a
Merge pull request #16312 from Microsoft/10662-startwindowscli
...
Windows: First part of CI tests (docker run)
2015-09-22 15:37:33 -04:00
9d8f9943e9
Bash completion: avoid 'compopt: command not found' errors on Mac OS
...
The shell builtin `compopt` is not available on the outdated bash
version 3.2.57 that ships with Mac OS.
It is used in Docker's bash completion to suppress trailing spaces
in advanced completions of hash map options, e.g. `--log-opt`.
If `compopt` is not available, the new behavior is to do nothing,
i.e. the user will have to delete the additional space.
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-22 12:17:30 -07:00
114612305c
Merge pull request #16235 from HuKeping/oom-event
...
Events for OOM needs to be shift to an earlier time
2015-09-22 11:50:30 -07:00
8a5ab83df8
Windows: First part of CI tests (docker run)
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-22 10:24:03 -07:00
bfc785bf64
Merge pull request #16428 from charleswhchan/fix-logs-doc
...
Touch up 'docker logs' documentation.
2015-09-22 07:17:26 -07:00
6353f3a7b5
Format the output of docker history
...
Once there have '\t' in the "CREATED BY" section, it will possibly
cause a messy output of docker history.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-22 21:27:20 +08:00
44f47903a8
Merge pull request #16444 from fgimenez/11584-pkg-stdcopy-test-coverage
...
Added tests for Write
2015-09-22 14:28:14 +02:00
3efe5ff22e
Added tests for StdWriter.Write.
...
The tests added cover the case when the Writer field returns and error
and, related to that, when the number of written bytes is less than 0.
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
2015-09-22 09:05:22 +02:00
a7e23cab8d
Merge pull request #15864 from dmcgowan/notary-offline
...
Support content trust offline
2015-09-21 21:11:36 -07:00
f97e6f2a37
Merge pull request #16419 from HuKeping/comments
...
Comment: add description for some code which hard to understand
2015-09-21 20:44:54 -07:00
eff524e19c
Touch up 'docker logs' documentation.
...
* Update format for 'Note:' to match other pages.
* Add link to Go's RFC3339Nano timestamp information.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-21 19:47:33 -07:00
3b443abec2
Comment: add description for some code which hard to understand
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-22 09:34:49 +08:00
108891069f
Merge pull request #16400 from albers/completion-log-opt-tags
...
bash completion: use generic `tag` log driver option
2015-09-21 17:17:11 -07:00
5c73f14c62
Merge pull request #16457 from Microsoft/10662-blockarg
...
Windows: Nice error on ARG (builder)
2015-09-21 19:43:48 -04:00
b69c13b1a6
Windows: Nice error on ARG (builder)
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-21 14:54:15 -07:00
985b7ec895
Merge pull request #16465 from albers/reference-capability-all
...
reference: capability `all` should be `ALL`
2015-09-21 16:49:17 -04:00
a8eba11fb1
Merge pull request #16461 from tomdee/libnetwork-routes-fixes
...
Vendoring libnetwork
2015-09-21 16:48:16 -04:00
da82b5fedb
Merge pull request #16466 from runcom/15876-fix-TestRunWithKernelMemory
...
daemon: execdriver: lxc: fix wrong template value passed to lxc conf
2015-09-21 16:34:34 -04:00
0c71c19239
Merge pull request #16404 from duglin/FixRenameError
...
Fix 'rename' error msg and error checking
2015-09-21 15:51:02 -04:00
732676fad5
Merge pull request #16413 from sunyuan3/TestRunSwapMoreThanMemoryLimit
...
Add the TestRunSwapMoreThanMemoryLimit case.
2015-09-21 15:43:20 -04:00
7b4f73ee6c
daemon: execdriver: lxc: fix wrong template value passed to lxc conf
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-21 21:40:46 +02:00
2daa5b1735
Merge pull request #16432 from calavera/volume_store
...
Move volume ref counting store to a package.
2015-09-21 15:38:06 -04:00
d37674b44b
reference: capability `all` should be `ALL`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-21 21:09:50 +02:00
d572bab4a0
Merge pull request #16437 from runcom/invalid-logger-address
...
daemon: logger: error out on daemon start if invalid logger address
2015-09-21 14:53:47 -04:00
40edb5f97c
Merge pull request #15029 from azurezk/add-version-info
...
Add docker version info in /info request
2015-09-21 11:44:11 -07:00
0fea04d27e
Organize server pre-func logic in middlewares.
...
It defines global middlewares for every request.
This makes the server slightly more composable.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-21 14:27:06 -04:00
499ade0116
Vendoring libnetwork
...
Pull in version e5fea92a6c8a5968bdb8005bf959c6e23113b689
Fixes libnetwork regressions that stopped drivers that set routes from working.
Pulls in libnetwork PRs #546 #543
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
2015-09-21 11:13:14 -07:00
f018c0430b
Merge pull request #16449 from runcom/add-container-label-userguide
...
docs: userguide: add container labels section
2015-09-21 10:26:20 -07:00
72bb56618b
Move volume ref counting store to a package.
...
- Add unit tests to make sure the functionality is correct.
- Add FilterByDriver to allow filtering volumes by driver, for future
`volume ls` filtering and whatnot.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-21 12:46:49 -04:00
587558f617
Merge pull request #16440 from runcom/tempdir-check-errs
...
integration-cli: check err on tmp dir creation
2015-09-21 08:06:08 -07:00
ab39a4c981
Add the TestRunSwapLessThanMemoryLimit case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-09-21 22:12:19 +08:00
7cf343d106
add docker server version to /info
...
Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-09-21 21:15:32 +08:00
743dc1c791
Merge pull request #16443 from coolljt0725/simplify_volume_code
...
Cleanup: remove unnecessary return at the end of block in volume.go
2015-09-21 09:05:16 -04:00
124540c086
docs: userguide: add container labels section
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-21 14:41:22 +02:00
5746eb9501
Cleanup: remove unnecessary return at the end of block in volumes.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-09-21 04:32:37 -04:00
f05bacbe50
Events for OOM needs to be shift to an earlier time
...
It's worth to warn user as soon as possilbe when OOM happend.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-21 10:18:08 +08:00
4a6e8c8f3c
Merge pull request #16174 from sallyom/man-restart-fix
...
docker restarts running OR stopped containers
2015-09-20 18:10:06 -07:00
76b3b54314
api: server: container: fix wrong comment
...
This comment was wrongly referring to the old job mechanism and it
wasn't clear what it was trying to document.
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-21 00:46:16 +02:00
b616b8a17a
integration-cli: check err on tmp dir creation
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-21 00:00:55 +02:00
4133401bf9
Merge pull request #16425 from charleswhchan/fix-version-doc
...
Add missing '[OPTIONS]' arg to documentation for 'docker version'.
2015-09-20 14:33:47 -07:00
e3c472426f
daemon: logger: error out on daemon start if invalid logger address
...
If an invalid logger address is provided on daemon start it will
silently fail. As syslog driver is doing, this check should be done on
daemon start and prevent it from starting even in other drivers.
This patch also adds integration tests for this behavior.
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-20 16:20:25 +02:00
e41753678d
docker restarts running OR stopped containers, docs edit rm "running"
...
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-09-20 09:16:27 -04:00
148be8bd7e
Merge pull request #16430 from runcom/pkg-integration-fix-format
...
pkg: integration: utils_test: fix int format
2015-09-20 06:48:58 -05:00
ee6b81faf2
Docs: correct the description of docker cp
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-09-20 18:02:28 +08:00
John Howard
Brian Goff
David Calavera
Phil Estes
Harald Albers
moxiegirl
Hu Keping
Antonio Murdaca
Federico Gimenez
Alexandre Beslic
Charles Chan
Tibor Vass
Evan Hazlett
Antonio Murdaca
Tom Denham
Yuan Sun
Zhang Kun
Lei Jitang
Sally O'Malley
Doug Davis