Ying Li
819499d6d7
Merge pull request #652 from docker/docs-update
...
Include docs about what happens if a client's keys get compromised
2016-04-06 00:23:32 -07:00
Yi EungJun
2f69d7689d
Use 'null' instead of 'nil' for json
...
When describe json response, 'null' is better than 'nil' which is not in
json specification.
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com >
2016-04-06 16:13:48 +09:00
Yi EungJun
4a698c9c43
Fix incorrect markdown rendering
...
The docker document site [1] rendered the list of plugin implements
incorrectly.
[1]: https://docs.docker.com/engine/extend/plugin_api
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com >
2016-04-06 15:37:49 +09:00
Sun Hongliang
b6f646cacd
log err when remove container fails in rescheduling
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io >
2016-04-06 14:23:09 +08:00
Santhosh Manohar
5b892819a6
Vendor Libnetwork v0.7.0-rc.3
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
2016-04-05 22:01:19 -07:00
Aaron Lehmann
81b01b44c6
Merge pull request #21767 from allencloud/fix-typos
...
fix typos
2016-04-05 20:32:14 -07:00
allencloud
34700cc1f3
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
2016-04-06 10:35:01 +08:00
John Howard
d6ab2ad36d
Windows: integration-cli don't delete nat
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-04-05 19:29:43 -07:00
John Howard
83809de7d4
Windows: Dockerfile for TP5
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-04-05 19:08:20 -07:00
Dongluo Chen
08090d51f8
Merge pull request #2090 from HackToday/fixolddoc
...
Fix old NODE column
2016-04-05 18:49:05 -07:00
Kai Qiang Wu(Kennan)
2a778b3600
Fix old NODE column
...
Some fixes was missed in last PR.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
2016-04-06 01:39:39 +00:00
Qiang Huang
50a6181005
Add minimum limit for memory reservation
...
Kernel has no limit for memory reservation, but in different
kernel versions, the default behavior is different.
On kernel 3.13,
docker run --rm --memory-reservation 1k busybox cat /sys/fs/cgroup/memory/memory.soft_limit_in_bytes
the output would be 4096, but on kernel 4.1, the output is 0.
Since we have minimum limit for memory and kernel memory, we
can have this limit for memory reservation as well, to make
the behavior consistent.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2016-04-06 09:37:51 +08:00
Victor Vieux
1f61d438de
Merge pull request #2088 from HackToday/fixolddoc
...
Fix doc for NODE column
2016-04-05 17:48:49 -07:00
Kai Qiang Wu(Kennan)
8afd32a631
Fix doc for NODE column
...
Swarm docker ps output nolonger have NODE column, So this updates the doc
Fixes : #2081
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
2016-04-06 00:41:55 +00:00
French Ben
20a0a4b670
Updated path to work properly on linux
...
Signed-off-by: French Ben <me+git@frenchben.com >
2016-04-05 17:14:34 -07:00
John Howard
5175c9a5ea
Windows: So long TP4, so long...
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-04-05 16:39:27 -07:00
Darren Stahl
80d6f672f5
Stop running symlink-volume tests on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
2016-04-05 16:37:00 -07:00
John Howard
fc9912fd00
Merge pull request #21272 from Microsoft/jstarks/manifest_updates
...
Add os_version and os_features to Image
2016-04-05 16:16:25 -07:00
Ying Li
6e84b596ca
Merge pull request #665 from cyli/changelist-assert-require
...
Change assert to require in client/changelist
2016-04-05 15:59:05 -07:00
Richard Scothern
27e0be3e95
Merge pull request #1583 from dmcgowan/golem-integration-tests
...
Update docker integration tests to use golem
2016-04-05 15:38:01 -07:00
Ying Li
38cfb6f961
Change assert to require in client/changelist package.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-05 15:13:29 -07:00
Ying Li
b623214737
Link Audit PDF. Other grammatical and formatting changes.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-05 15:08:52 -07:00
Ying Li
4881afd56c
Single space after a full stop in already-touched files
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-05 15:08:52 -07:00
Ying Li
7cbe4da88f
Turn external links into html tags that target a new window.
...
Make the links to www.theupdateframework.com consistent.
Link to a particular git sha of the TUF spec.
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-05 15:08:52 -07:00
Ying Li
ac213d44c8
Update README to link to our other docs
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-05 15:08:52 -07:00
Ying Li
1396e8890d
Convert the key compromise data into a tabular format
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-05 15:08:52 -07:00
Ying Li
3ad94c8e51
Bump GO version requirement in README to 1.6
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-05 15:08:52 -07:00
Ying Li
71c5e29ee1
Address review comments with regard to key hierarchy
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-05 15:08:52 -07:00
Ying Li
bbc70996cd
Include docs about what happens if a client's keys get compromised
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-05 15:08:52 -07:00
Alexander Morozov
806a8e22b9
Merge pull request #21755 from cpuguy83/bytespipe_allocs
...
Improve performance/reduce allocs of bytespipe
2016-04-05 14:43:57 -07:00
Riyaz Faizullabhoy
1f3c04a0b1
Merge pull request #651 from docker/update-vendor-test
...
Update vendoring test to use new vendor structure
2016-04-05 13:46:56 -07:00
Riyaz Faizullabhoy
de36693ce7
Remove vendor from GOPATH, use GO15VENDOREXPERIMENT flag
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-05 13:25:32 -07:00
Riyaz Faizullabhoy
66bd0579a3
Update vendoring test to use new vendor structure
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-05 13:25:32 -07:00
Ying Li
90c91d568f
Merge pull request #664 from cyli/tuf-assert-require
...
Finish converting assert to require in tuf/* packages
2016-04-05 13:14:53 -07:00
Victor Vieux
d0cd5ea554
Merge pull request #2077 from nishanttotla/update-engine-api-backward-compat
...
Updating apiClient version based on engine version
2016-04-05 12:28:33 -07:00
Nishant Totla
012dffeee3
Updating apiClient version using server version
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2016-04-05 11:25:17 -07:00
Ying Li
79238e087f
Change assert to require in tuf/* packages
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-05 11:21:14 -07:00
David Lawrence
7bd09c523b
Merge pull request #655 from docker/server-signer-alpine
...
Convert the server and signer images to use alpine
2016-04-05 10:55:39 -07:00
David Lawrence
69a25b8906
Merge pull request #661 from docker/cryptoservice-require
...
Update to use require for cryptoservice package
2016-04-05 10:07:37 -07:00
Brian Goff
9a25b1d942
Improve performance/reduce allocs of bytespipe
...
Creates a `fixedBuffer` type that is used to encapsulate functionality
for reading/writing from the underlying byte slices.
Uses lazily-loaded set of sync.Pools for storing buffers that are no
longer needed so they can be re-used.
```
benchmark old ns/op new ns/op delta
BenchmarkBytesPipeWrite-8 138469 48985 -64.62%
BenchmarkBytesPipeRead-8 130922 56601 -56.77%
benchmark old allocs new allocs delta
BenchmarkBytesPipeWrite-8 18 8 -55.56%
BenchmarkBytesPipeRead-8 0 0 +0.00%
benchmark old bytes new bytes delta
BenchmarkBytesPipeWrite-8 66903 1649 -97.54%
BenchmarkBytesPipeRead-8 0 1 +Inf%
```
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-04-05 13:06:04 -04:00
David Lawrence
8757f5edb8
Merge pull request #660 from docker/cmd-require-tests
...
Use require instead of assert for cmd
2016-04-05 10:05:54 -07:00
David Lawrence
541b63d9cc
Merge pull request #662 from docker/signer-require
...
Use require instead of assert for signer package
2016-04-05 10:04:28 -07:00
David Lawrence
b9b0d1f788
Merge pull request #663 from docker/trustmanager-require
...
Use require for certs and trustmanager
2016-04-05 10:03:37 -07:00
Richard Scothern
75e55632fd
Merge pull request #1597 from tonyhb/log-upload-copy-errors
...
Ensure we log io.Copy errors and bytes copied/total in uploads
2016-04-05 09:46:12 -07:00
Nishant Totla
cbb7c27621
Updating Godeps (engine-api)
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2016-04-05 09:16:50 -07:00
Vincent Demeester
83bc8d2b8c
Merge pull request #21763 from larsbutler/names-generator-comment-typo-fix
...
Fix spelling error in names-generator.go
2016-04-05 13:58:14 +02:00
Lars Butler
0cad90911f
Fix spelling error in names-generator.go
...
Signed-off-by: Lars Butler <Lars.Butler@gmail.com >
2016-04-05 12:34:52 +02:00
Vincent Demeester
8d31b0f051
Merge pull request #21719 from senk/21710-fix-client-help-text
...
Fixing help text of "docker network --help" to be consistent
2016-04-05 09:38:35 +02:00
Vincent Demeester
deedb063b3
Merge pull request #21713 from sunyuan3/kernel-memory20160401
...
Add pause status check for --kernel-memory
2016-04-05 09:37:39 +02:00
Tom Deseyn
c1904a1729
azure.md: extend documentation of command line options
...
Improve doc of azure-subnet-prefix, azure-use-private-ip and
azure-no-public-ip options.
https://github.com/docker/machine/issues/3249
Signed-off-by: Tom Deseyn <tom.deseyn@gmail.com >
2016-04-05 06:14:08 +02:00