Commit Graph

23842 Commits

Author SHA1 Message Date
Ken Cochrane f68b61052b Create the correct directory structure for apt-ftparchive. fixes #22238
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-22 16:28:49 -04:00
Alexander Morozov 86a6acf071 Merge pull request #22218 from HackToday/fixcpu
Make cpu validation correct
2016-04-22 10:56:01 -07:00
Tibor Vass 4377a58c12 Merge pull request #22015 from endophage/pkcs11_debs
add pkcs11 build tag to deb and rpm builds
2016-04-22 13:29:44 -04:00
Sven Dowideit 9b00817dc6 Merge pull request #22196 from thaJeztah/add-mac-address-note
docs: add note about MAC addresses not being unique
2016-04-22 11:26:17 +10:00
Kai Qiang Wu(Kennan) 62cb06a6c1 Make cpu validation correct
There was an error in validation logic before, should use period
instead of quota, and also add check for negative
number here, if not with that, it would had cpu.cfs_period_us: invalid argument
which is not good for users.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-22 01:18:03 +00:00
Alexander Morozov 0b67f4c895 Merge pull request #22234 from tonistiigi/safer-writes
Safer file io for configuration files
2016-04-21 16:00:47 -07:00
Tonis Tiigi ea3cbd3274 Safer file io for configuration files
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-21 11:31:15 -07:00
Michael Crosby 6f67c13d20 Merge pull request #22213 from yongtang/22210-docker-http-panics
Docker http panics caused by container deletion with empty names.
2016-04-21 10:37:24 -07:00
Alexander Morozov 228759fd42 Merge pull request #22172 from cpuguy83/fix_nosapce_test
Containerize `TestDaemonNoSpaceLeftOnDeviceError`
2016-04-21 09:41:31 -07:00
Alexander Morozov f8945836e1 Merge pull request #22227 from kencochrane/bump_go_1.6.2
Bump Go version to 1.6.2 from 1.6.1 where it was used
2016-04-21 09:40:04 -07:00
Brian Goff b006f7f640 Merge pull request #21683 from mYmNeo/growFS
call growFS when size is a mismatch
2016-04-21 12:02:44 -04:00
David Calavera 01dd64cd10 Merge pull request #22193 from panyufeng920/master
optimise docs
2016-04-21 08:38:27 -07:00
Vincent Demeester c931a7c576 Merge pull request #22219 from leonhartX/zsh-completion-add-disable-content-trust
Add zsh completion for 'docker {build,create,run} --disable-content-trust'
2016-04-21 17:08:38 +02:00
Yong Tang 9d8071a74d Docker http panics caused by container deletion with empty names.
This fix tries to fix the http panics caused by container deletion
with empty names in #22210.

The issue was because when an empty string was passed, `GetByName()`
tried to access the first element of the name string without checking
the length. A length check has been added.

A test case for #22210 has been added.

This fix fixes #22210.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-04-21 07:53:49 -07:00
Brian Goff 70746f4c38 Merge pull request #22220 from dandric-activevideo/fix-storage-opts-doc
Fix daemon.json storage-opts settings example
2016-04-21 09:53:03 -04:00
Ken Cochrane 09ca4dd322
Bump Go version to 1.6.2 from 1.6.1 where it was used
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-21 09:43:32 -04:00
Sven Dowideit 7bfe5408a1 Merge pull request #22216 from HackToday/fixolddoc
Fix the old exit status example
2016-04-21 21:31:09 +10:00
Dimitry Andric e3eb24fc21 The daemon.json storage-opts settings is actually a list.
Signed-off-by: Dimitry Andric <d.andric@activevideo.com>
2016-04-21 10:56:35 +02:00
Ke Xu da90fe0218 add zsh completion for 'docker {build,create,run} --disable-content-trust'
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
2016-04-21 16:06:09 +09:00
Kai Qiang Wu(Kennan) 896ebb1ca2 Fix the old exit status example
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-21 03:24:10 +00:00
搏通 9abf304c25 optimise docs
Signed-off-by: 搏通 <yufeng.pyf@alibaba-inc.com>
2016-04-21 09:34:28 +08:00
Sebastiaan van Stijn ccf83c94d1 Merge pull request #22171 from mlaventure/always-disable-metrics
Always disable containerd metrics when started by docker
2016-04-21 01:38:07 +02:00
Sebastiaan van Stijn 0f14b566d9 Merge pull request #22200 from jfrazelle/remove-self
Remove Jess from Maintainers
2016-04-21 01:14:56 +02:00
Michael Crosby 24076ed4d9 Merge pull request #22173 from amitkris/uprev_dbus
Update godbus/dbus to v4.0.0
2016-04-20 15:39:00 -07:00
Vincent Demeester 483063ad85 Merge pull request #22203 from alimate/name-gen-patch
Added Lamport & Agnesi to the list of scientists
2016-04-20 21:03:18 +02:00
Sebastiaan van Stijn 763aceeb73
docs: add note about MAC addresses not being unique
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-20 19:24:39 +02:00
Ali Dehghani 85e880205f Added Lamport & Agnesi to the list of scientists
Leslie B. Lamport is an American computer scientist. Lamport is
best known for his seminal work in distributed systems and as the
initial developer of the document preparation system LaTeX.
Maria Gaetana Agnesi was an Italian mathematician, philosopher,
theologian and humanitarian. She was the first woman to write a
mathematics handbook and the first woman appointed as a Mathematics
Professor at a University.

Signed-off-by: Ali Dehghani <ali.dehghani.g@gmail.com>
2016-04-20 21:44:22 +04:30
Sebastiaan van Stijn 3022a43f42 Merge pull request #22201 from moxiegirl/update-readme
Removing ref to old google group; adding forum
2016-04-20 18:42:47 +02:00
Mary Anthony 3447847079 Removing ref to old google group; adding forum
Adding email notice
user > dev and an > a

Signed-off-by: Mary Anthony <mary@docker.com>
2016-04-20 09:34:49 -07:00
Jess Frazelle 145fb8de9e Remove Jess from Maintainers
Signed-off-by: Jess Frazelle <jess@mesosphere.com>
2016-04-20 08:50:42 -07:00
David Calavera cf03e17c5c Merge pull request #22191 from mavenugo/jp
Initialize activateWait for plugins activated by json spec
2016-04-20 08:37:20 -07:00
Sebastiaan van Stijn afbe2869f0 Merge pull request #22187 from thaJeztah/add-madhu-to-maintainers
Add Madhu Venugopal to maintainers
2016-04-20 17:17:41 +02:00
moxiegirl f96d15d3c3 Merge pull request #21389 from chenchun/resize_direct_lvm
Resize direct lvm
2016-04-20 06:33:37 -07:00
moxiegirl fc25376762 Merge pull request #22189 from thaJeztah/restructure-plugin-docs
docs: use tables for available plugins
2016-04-20 06:32:23 -07:00
Madhu Venugopal de806a672b Initialize activateWait for plugins activated by json spec
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-04-20 05:59:19 -07:00
Sebastiaan van Stijn 79351caec1
docs: use tables for available plugins
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-20 13:45:31 +02:00
Sebastiaan van Stijn 3cf4cad082 Merge pull request #22179 from wenchma/fix_asa
Fix asa
2016-04-20 12:44:29 +02:00
Sebastiaan van Stijn 06753c6df6
Add Madhu Venugopal to maintainers
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-20 11:17:32 +02:00
Vincent Demeester 34cc274a80 Merge pull request #21380 from sainath14/improve_help_text_test_time
Improve the time taken by DockerSuite.TestHelpTextVerify
2016-04-20 08:03:45 +02:00
Wen Cheng Ma 6d4e7b67be Fix asa
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-04-20 11:14:47 +08:00
Chun Chen b21d90c28f Add docs about how to extend devicemapper thin pool
Signed-off-by: Chun Chen <ramichen@tencent.com>
2016-04-20 10:49:51 +08:00
Sainath Grandhi 7f33ec7507 Improve the time taken by DockerSuite.TestHelpTextVerify. This test runs docker <command> --help on all commands supported and also check the output
when it is passed with bad arguments and no arguments. This patch would divide the total number of commands into five sets and runs them in parallel.
Test time is improved from around 9 seconds to around 3 seconds

Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
2016-04-19 16:46:59 -07:00
Brian Goff bb91bd3a89 Merge pull request #22043 from WeiZhang555/remove-start-event-failed-start
Remove start/die event when fail to start container
2016-04-19 19:45:40 -04:00
Amit Krishnan 1c967911b9 Update godbus/dbus to v4.0.0
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
2016-04-19 14:51:55 -07:00
Brian Goff 59b83d8aae Containerize `TestDaemonNoSpaceLeftOnDeviceError`
Why? Because the `mount` here will sometimes fail when run in
`debian:jessie`, which is what the environrment hosting the test suite
is running if run from the `Makefile`.
Also, why the heck not containerize it, all the things.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-19 17:16:18 -04:00
Kenfe-Mickael Laventure 42f9c25b51 Always disable containerd metrics when started by docker
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-04-19 13:37:18 -07:00
Brian Goff ab6b82b856 Merge pull request #22123 from crosbymichael/restart-canceled
Remove restart canceled error
2016-04-19 16:28:33 -04:00
Alexander Morozov eab65e438e Merge pull request #22153 from vdemeester/update-engine-api-again
Update engine api again for CopyToContainer and versions
2016-04-19 11:05:27 -07:00
Michael Crosby fc2e2234c6 Remove restart canceled error
It should not be an error to call a common option to cancel restarts.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-04-19 10:46:21 -07:00
moxiegirl 4a8519ba29 Merge pull request #22148 from thaJeztah/remove-old-api-versions
Remove API versions 1.17 and older from documentation
2016-04-19 10:26:56 -07:00