616950b030
Merge pull request #15687 from coolljt0725/add_blk_dev_throttling_to_check_config
...
Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
2015-08-21 13:48:28 -07:00
e6be51a0f9
Merge pull request #15758 from jfrazelle/EOL-fedora-20
...
fedora 20 is EOL remove from rpm builder
2015-08-21 13:15:58 -07:00
1425b185db
Merge pull request #15746 from Microsoft/libcontainer-spec-location
...
Updated spec location for libcontainer
2015-08-21 11:15:28 -07:00
ee1304a35e
fedora 20 is EOL remove from rpm builder
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-21 11:01:18 -07:00
eb7b2ed6bb
Merge pull request #15748 from coolljt0725/fix_daemon_start_with_old_running_container
...
Fix docker daemon start with old running container which use thirdparty volume plugin
2015-08-21 11:07:02 -04:00
85bef48bf5
Merge pull request #15754 from mountkin/fix-return
...
modify a return value in graph/tags.go to increase readability
2015-08-21 10:55:50 -04:00
10c97a310a
Merge pull request #15751 from nf/bcw
...
Use a slice instead of a map of io.WriteClosers in broadcastwriter
2015-08-21 10:51:07 -04:00
f11b7acc73
modify a return value in graph/tags.go to increase readability
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-08-21 21:36:30 +08:00
31cbf76d0c
Use a slice instead of a map of io.WriteClosers in broadcastwriter
...
Maps rely on the keys being comparable.
Using an interface type as the map key is dangerous,
because some interface types are not comparable.
I talked about this in my "Stupid Gopher Tricks" talk:
https://talks.golang.org/2015/tricks.slide
In this case, if the user-provided writer is backed by a slice
(such as io.MultiWriter) then the code will panic at run time.
Signed-off-by: Andrew Gerrand <adg@golang.org >
2015-08-21 14:08:04 +01:00
5ceff3f191
Merge pull request #15718 from ZJU-SEL/rm-volume-action
...
specify `docker run --rm` action when it comes to volume
2015-08-21 08:50:18 +02:00
c8a46cb0b2
Fix docker daemon start with old running container which user volume plugin. Fixes #15720
...
Signed-off-by: Lei Jitang <leijitang@huawei>
2015-08-21 11:29:53 +08:00
011b4ca256
Updated spec location for libcontainer
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
2015-08-20 20:04:04 -07:00
76a559ccb2
specify the docker run --rm action
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
2015-08-21 08:52:06 +08:00
d760947b2e
Merge pull request #15716 from calavera/release_checklist_docs
...
Corrections in the release checklist.
2015-08-20 22:29:42 +01:00
9ed5cf08a3
Merge pull request #15732 from moxiegirl/15731-fixes
...
Examples index has broken links
2015-08-20 22:56:45 +02:00
15c24db9a5
Examples index has broken links
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-20 13:40:03 -07:00
ec43113662
Merge pull request #15697 from sallyom/man-commit-fix
...
fix format man-commit
2015-08-20 21:33:46 +02:00
ba9496ae48
Merge pull request #15688 from Evalle/15564-fix-windows-doc
...
Fix a windows doc issue
2015-08-20 20:39:16 +02:00
3c61ede074
Fix a windows doc issue
...
Signed-off-by: evalle <shmarnev@gmail.com >
2015-08-20 14:14:48 +02:00
272a3eef94
Merge pull request #15696 from sallyom/man-history-fixup
...
add -H to SYNOPSIS man-history
2015-08-20 22:11:50 +10:00
44465098cb
Merge pull request #15661 from coolljt0725/fix_docker_stats_show_read_blkio
...
Fix docker stats show blkio when there are multiple block device
2015-08-20 07:53:38 -04:00
1d0ee18d6b
Corrections in the release checklist.
...
- Add a note about creating the release in GitHub.
- Fix docs release process.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-20 11:52:56 +01:00
d959739125
Merge pull request #15715 from aanand/fix-compose-1.2-changelog-link
...
Fix Compose 1.2 changelog link
2015-08-20 11:42:14 +01:00
90ebc3b455
Merge pull request #14928 from brahmaroutu/lint_daemon_graphdriver
...
daemon/graphdriver fix lint errors/warnings
2015-08-20 03:25:00 -07:00
23d3e4bb03
Fix Compose 1.2 changelog link
...
Hardcode the release tag, so that:
- it goes straight to the changes for 1.2, not whatever the current
version is
- it still works now that we've renamed CHANGES.md to CHANGELOG.md
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-08-20 11:09:10 +01:00
211449a1ca
Fix docker stats show blkio when there are multiple block devices.
...
Signed-off-by: Lei Jiang <leijitang@huawei.com >
2015-08-20 11:46:21 +08:00
8acd006fd9
Merge pull request #15707 from icaroseara/fix_typo
...
Fix typo, "fil" -> "fill"
2015-08-19 21:25:43 -04:00
997ba4b0da
Fix typo, "fil" -> "fill"
...
Signed-off-by: Icaro Seara <icaro.seara@gmail.com >
2015-08-19 21:50:54 -03:00
41ca7c0f13
Merge pull request #15675 from thaJeztah/carry-14625
...
[Carry #14625 ] run.md: --expose does NOT override Dockerfile EXPOSE
2015-08-20 00:49:16 +02:00
35cbcc2fc1
Add gists provided by Mary
...
This adds the example gists, provided by Mary Anthony,
also fixes a link to the old /terms/
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-08-20 00:30:39 +02:00
6dd84ba2ab
run.md: --expose does NOT override Dockerfile EXPOSE
...
run.md states that the operator can override all defaults set in the Dockerfile, and explicitly says that `--expose` overrides the `EXPOSE` instruction. Neither of these are true. An `EXPOSE` instruction cannot be overridden, `--expose` can only add additional exposed ports.
This change fixes the instructions, and also takes the liberty of crisping up the grammar and phrasing in a place or two.
Signed-off-by: Spencer Brown <spencer@spencerbrown.org >
2015-08-19 23:57:35 +02:00
286afb9a77
Merge pull request #15682 from MHBauer/cliorder
...
add weight to daemon page so it renders in order
2015-08-19 14:24:51 -07:00
2a84157352
add weight to daemon page so it renders in order
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-08-19 10:26:19 -07:00
f848f34da2
Merge pull request #15694 from liubin/fixtypo
...
add missing instruction
2015-08-19 19:05:41 +02:00
7f46dc03d5
Merge pull request #15684 from ibuildthecloud/dont-sync
...
Don't globally lock on driver initialization
2015-08-19 12:48:14 -04:00
ca79576585
Merge pull request #15664 from skatsuta/fix-parse-null
...
builder: avoid parsing null- string to nil slice (issue #15634 )
2015-08-19 09:06:20 -07:00
7ec7173b76
Merge pull request #15482 from hqhq/hq_fix_run_doc
...
Add format description in run doc
2015-08-19 17:13:00 +02:00
09cdd0524e
Merge pull request #15691 from skatsuta/fix-printf-wrong-type
...
integration-cli: fix printf verbs of wrong types
2015-08-19 08:12:45 -07:00
70c4b6e619
Merge pull request #15695 from lmesz/deviceset_warn_fix
...
deviceset.go: fixed link in warning about udex sync is not supported
2015-08-19 08:05:27 -07:00
59e49e1db0
Merge pull request #12927 from lindenlab/custom-host-port-ranges
...
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
2015-08-19 17:04:23 +02:00
43763805fb
Merge pull request #15690 from hacfi/docs-status-fix
...
Small fix in dev env docs
2015-08-19 07:12:39 -07:00
b8c319996f
Merge pull request #15683 from skatsuta/cli-exec-test-printf-int
...
integration-cli: modify %s to %d in formatting an int
2015-08-19 10:10:17 -04:00
ab9e71b616
fix format man-commit
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-08-19 10:07:32 -04:00
898114a6d0
add -H to SYNOPSIS man-history
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-08-19 09:35:52 -04:00
78676f19c1
deviceset.go: fixed link in warning about udex sync is not supported
...
Signed-off-by: Laszlo Meszaros <lacienator@gmail.com >
2015-08-19 14:16:40 +02:00
1988064ef2
add missing instruction
...
Signed-off-by: bin liu <liubin0329@gmail.com >
2015-08-19 18:43:19 +08:00
fbc0ea32e8
Small fix in dev env docs
...
Signed-off-by: Philipp Wahala <philipp.wahala@gmail.com >
2015-08-19 10:53:55 +02:00
5759b95e7e
integration-cli: fix printf verbs of wrong types
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp >
2015-08-19 17:47:33 +09:00
cbb69531a8
Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-19 15:11:04 +08:00
a41f431d11
integration-cli: use c.Assert(err, check.IsNil) instead of if err != nil
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp >
2015-08-19 15:23:11 +09:00
Jessie Frazelle