72b29b511a
Fix a typo: change "such Bash" to "such as Bash"
...
Signed-off-by: Anatoly Borodin <anatoly.borodin@gmail.com >
Upstream-commit: 5f9d1bc01876d31258bf2f86c6c2d9938eb680a9
Component: engine
2015-07-15 17:10:22 +02:00
c446ba7ae7
Merge pull request #14574 from SvenDowideit/elastic-ip-webhooks
...
Trusted build servers moved to AWS and use an elastic IP
Upstream-commit: a031b6476c219bdcf604857c2cac481c8aef517d
Component: engine
2015-07-15 12:20:50 +10:00
79e7cafd39
Trusted build servers moved to AWS and use an elastic IP
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 174870e64fbaf3e949ee8d6e874548bc2af26811
Component: engine
2015-07-14 19:20:09 -07:00
4289aab700
Merge pull request #14584 from Jason-Green-Aver/patch-1
...
Add missing periods to elements in ROADMAP.md
Upstream-commit: 8e7f2fc2e7cb95dc6639ec261118307618c2e486
Component: engine
2015-07-15 12:01:31 +10:00
98b7ddb8da
Merge pull request #14635 from jfrazelle/update-rpm-url
...
update urls for rpms
Upstream-commit: 35746ef97f1c8c54702b066745569241773f368e
Component: engine
2015-07-14 18:04:17 -07:00
15b4615804
Merge pull request #14639 from calavera/fix_read_write_check
...
Fix read-write check for volumes.
Upstream-commit: 8c7cd786502fffea155d73bbdb118c8d3903e8b2
Component: engine
2015-07-14 16:36:01 -07:00
9ec8332d92
Fix read-write check for volumes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 82a54001fdbd3d0c9bcdab1b5caf0a6c6c8079be
Component: engine
2015-07-14 15:50:43 -07:00
630edf5b02
Merge pull request #14521 from mattmoor/authenticated-search
...
Add the X-Docker-Token header to the /v1/search requests.
Upstream-commit: c7d4a4b2b440f5cbbe094174bb2f23c85370787b
Component: engine
2015-07-14 15:43:28 -07:00
ea5ef83f1e
update urls for rpms
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 24bb36297c1457d71114d678671f77001b6936a5
Component: engine
2015-07-14 15:26:11 -07:00
b7855d52d5
Merge pull request #13694 from vdemeester/opts-test-coverage
...
Tests, refactor and coverage on package opts
Upstream-commit: ecdbf868842f702e2b824aa1e11097809d48a659
Component: engine
2015-07-14 15:09:48 -07:00
5c9ded5915
Merge pull request #14304 from vieux/http_proxy_support
...
add support for base path in docker cli -H
Upstream-commit: 4e9280ffdb40f6370f808c81f72a19f1332a0287
Component: engine
2015-07-14 13:21:51 -07:00
e8b27ad088
Merge pull request #14618 from hqhq/hq_add_check_for_swappiness
...
Add hostConfig check for MemorySwappiness
Upstream-commit: d2fe5bd12f32bd776d052e41196b33af017d4439
Component: engine
2015-07-14 15:24:50 -04:00
4962dffc73
Merge pull request #14629 from LK4D4/pubsub_timer_off
...
pkg/pubsub: Don't use time.After if there is no timeout
Upstream-commit: e5fa2a740dacc3098371fd39bc86050c40f96504
Component: engine
2015-07-14 13:06:57 -04:00
f2a3bdc069
Merge pull request #14252 from sallyom/docs-use-lowercase
...
Modify man pages for image-naming
Upstream-commit: 899f6f2a8917c0af6588e5e58893c698c38d5bda
Component: engine
2015-07-14 18:34:36 +02:00
d0e6da9737
Don't use time.After if there is no timeout
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: bc6ad1608c37b56aa031760cc07e9a30ebe030d8
Component: engine
2015-07-14 09:14:51 -07:00
2c3627f184
Add docstring to pubsub.Publisher
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 7080f5d1cf2c9f86d89a84424394b2c61e925843
Component: engine
2015-07-14 09:10:14 -07:00
4fb7b8e2f2
Merge pull request #14608 from vincentbernat/fix/zsh-reviewers
...
zsh: remove Vincent Bernat from reviewers for ZSH completion
Upstream-commit: cf09e435c843516af8bbe0460cd5e1f014c0e01a
Component: engine
2015-07-14 07:08:06 -07:00
07f5189707
Merge pull request #14494 from HuKeping/update-docs
...
docs: update docs for API history
Upstream-commit: aaf1426995e8a2b5850598e384db4d07eb4d939c
Component: engine
2015-07-14 08:16:00 -04:00
d59656f4c5
docs: update docs for API history
...
The response of hitory API includes more information now.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 29660f263e07db404cf95b6a2efdc503e6dea2d2
Component: engine
2015-07-14 19:54:24 +08:00
c0caaeaec9
Merge pull request #14458 from hqhq/hq_fix_docs_create
...
Docs: fix commandline doc create.md and run.md
Upstream-commit: daffcc044bed68b21c28b4fe3d01066260e53ce1
Component: engine
2015-07-14 08:10:41 +02:00
f00859fc78
Add hostConfig check for MemorySwappiness
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 19c7b65ea600ab77679c9506d762201264dd9a2a
Component: engine
2015-07-14 13:52:57 +08:00
90ddc78ef7
Merge pull request #14595 from LK4D4/pubsub_bench
...
Benchmark and race test for pkg/pubsub
Upstream-commit: 154820aca6076803e4541d12e46db66214994455
Component: engine
2015-07-13 23:04:44 -04:00
5720e89e93
Add missing periods to elements in ROADMAP.md
...
Signed-off-by: Jason Green <Jason.Green@AverInformatics.Com >
Upstream-commit: 59aa3b27cad988dc21cafb04504191f94938be58
Component: engine
2015-07-13 23:01:34 -04:00
e7044bb830
Docs: fix commandline doc create.md and run.md
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: c3b77bbe8b69d1588320eb5a6a6fd152f68e10bd
Component: engine
2015-07-14 09:26:59 +08:00
a1ee4d8815
Merge pull request #14021 from rhvgoyal/detect-pool-loopback-devices
...
devicemapper: Check loop devices of existing pool
Upstream-commit: 5ca3e7c54c9140f2b8553060fdd75d3986e6db6e
Component: engine
2015-07-13 21:15:23 -04:00
4c94e1cdab
Merge pull request #10717 from mrunalp/feature/group_add
...
Adds support for specifying additional groups.
Upstream-commit: 35b02239216d7c976d4b07022429fec25ff9669d
Component: engine
2015-07-13 17:08:05 -07:00
d2963e7a5e
Merge pull request #14194 from phemmer/cli-version-format
...
add --format flag to `docker version`
Upstream-commit: e221291a25fb905a476d9328785bdbfbd9cb7373
Component: engine
2015-07-13 17:04:06 -07:00
2aff354ec5
add --format flag to docker version
...
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com >
Upstream-commit: 41588a57662456f1a27c48921c680ac2a6e079c3
Component: engine
2015-07-13 19:10:56 -04:00
d604057959
Merge pull request #14599 from brahmaroutu/gccgo_timeduration
...
time duration should be nano seconds, gccgo treats it as zero
Upstream-commit: 60b34cb957b224e28e6350bbebd629bec61730b5
Component: engine
2015-07-13 16:44:45 -06:00
1bf7ad599f
Merge pull request #14581 from vdemeester/14573-docs-docker-bestpractice-fix
...
Fixes TOC in dockerfile_best_practices.md
Upstream-commit: 73bd855dcc7f5878f9cc638f37a3c2b32a433426
Component: engine
2015-07-13 15:14:56 -07:00
fed66f56be
Merge pull request #14607 from brahmaroutu/increase_timeout
...
increase timeout to run tests on slow platforms
Upstream-commit: 23d0676c077d87205ad7b4f90c2dfb90037c12a6
Component: engine
2015-07-13 14:56:17 -07:00
aff29f60ab
Fixes TOC in dockerfile_best_practices.md
...
Decided to put the link in a reference word.
Closes #14573
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d03923732f36628f1897c03d5cba7653f156c5c2
Component: engine
2015-07-13 23:46:04 +02:00
35171e122f
Merge pull request #14343 from Pensu/14232-Add-Warning-To-Ubuntu-Script
...
14232 add warning to ubuntu script
Upstream-commit: 5e331ad41a8c3ada92856a85c2411f80409284fd
Component: engine
2015-07-13 14:38:58 -07:00
0602984ad2
Merge pull request #14518 from Microsoft/10662-infowarnings
...
Windows: Remove meaningless warnings on docker info
Upstream-commit: 41858096592cdb13893ce9e618997856d615b016
Component: engine
2015-07-13 14:30:57 -07:00
76ff8db2cc
Merge pull request #14205 from YanFeng-Adam/patch
...
update testcase mount/sharedsubtree_linux_test.go
Upstream-commit: 363cc51e82cd69e91f81086f50a31c0ecc61f4b1
Component: engine
2015-07-13 14:28:30 -07:00
3c6e2ebd6f
zsh: remove Vincent Bernat from reviewers for ZSH completion
...
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: 5dbb217bcb8eb33c4c152f7ba1b5f7fec0b579dd
Component: engine
2015-07-13 23:15:16 +02:00
14e7c996e2
Increase timeout to run tests on slow platforms
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: b98edced9e16e73b84a1a7fc670d4c3f6d57f3e8
Component: engine
2015-07-13 21:13:17 +00:00
ebb3aa0ddb
Merge pull request #14567 from Microsoft/10662-fixbuilder
...
Windows: Fix builder
Upstream-commit: 15f9766691b7af54a0b5aca94f0777c50d2fd8c5
Component: engine
2015-07-13 13:50:52 -07:00
b0b206a336
Merge pull request #14516 from Microsoft/10662-mergeLXCconf
...
Windows: Tidy up daemon\utils*.go
Upstream-commit: c2b9fa8c9a70be7f4305cf30636d276499980bac
Component: engine
2015-07-13 14:47:25 -06:00
d231ef5cce
Merge pull request #14556 from Evalle/14497-fix-install-script
...
Fix issue with detection logic of Centos in install.sh
Upstream-commit: 655b1d23678f67857a1d39606eebb86799f65f06
Component: engine
2015-07-13 13:47:08 -07:00
6e9e97f954
Merge pull request #14601 from runcom/cleanup-deleteImages
...
Cleanup not needed calls to deleteImages
Upstream-commit: 1da384314978a9921bc65d2182ea5572e429eb34
Component: engine
2015-07-13 14:04:20 -06:00
72d80b3764
Modify man pages for image-naming
...
This PR adds recommendations in man pages to use only [a-z0-9-_.] when
naming and tagging images. The purpose of this is to add consistency
and to make image naming caps rules seem less arbitrary.
This PR addresses confusion with:
1. BaseImage:Tagged (not allowed)
2. baseimage:Tagged (allowed)
3. baseimage/tagged:V1 (allowed)
4. baseimage/Tagged:V1 (not allowed)
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 05a86905a2e476ec9261db9107101da77a7e49f4
Component: engine
2015-07-13 15:49:41 -04:00
8a6a98a270
Merge pull request #14596 from Microsoft/quieter-clean-exec-commands
...
Quieter debug logging for clean exec commands
Upstream-commit: 9158ddef890deb624e2c8924a3c14132d55f18ad
Component: engine
2015-07-13 15:43:27 -04:00
7af622bdcb
Fix issue with detection logic of Centos in install.sh
...
Signed-off-by: evalle <shmarnev@gmail.com >
Upstream-commit: 33039aa12939f6be6d8775ca5d9bee7541641053
Component: engine
2015-07-13 20:50:31 +02:00
5a8eca0b0b
Fixup rebase.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 7fb456589bee9d98cc7273cae25ae2d7aa743975
Component: engine
2015-07-13 14:50:30 -04:00
8a8cd3160c
Adds documentation for additional groups.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: d77d0268eb1f419509ceb6670ff7aaa298314218
Component: engine
2015-07-13 14:47:28 -04:00
6b6bb1a8e9
Adds test for additional groups.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 0b7938e8459eda3b80bcc581837e90edc4d6855f
Component: engine
2015-07-13 14:47:28 -04:00
b0da7fa04d
Adds support for specifying additional groups.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: e0d96fb3ef562103690529c34140d04604599497
Component: engine
2015-07-13 14:47:28 -04:00
f4541a8bb5
Cleanup not needed calls to deleteImages
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: d3566fa0b1130fb938ad55da69fee2b7790dc3cf
Component: engine
2015-07-13 20:30:53 +02:00
6ee4a354ae
time duration should be nano seconds, gccgo treats it as zero
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 6c4e14b3e233ba7359dfa51045937d761e28268e
Component: engine
2015-07-13 18:01:43 +00:00
