07a198d3da
Merge pull request #14932 from brahmaroutu/lint_daemon_graphdriver_graphtest
...
daemon/graphdriver/graphtest/ fix lint errors/warnings
Upstream-commit: be60047b43ae856fedc484a9349e5756922ae84b
Component: engine
2015-07-28 11:20:33 -07:00
48c1e253ec
daemon.md: do fix placement of exec driver heading
...
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.
Now, this is the second time I am fixing this. First time
it was commit 68efb27, but the following commit 9af7afb
screwed it up again, so the header appears twice now.
Get rid of the the wrong one.
Cc: David Calavera <david.calavera@gmail.com >
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
Upstream-commit: f52514a03888441a51aac677054958516b2ae43f
Component: engine
2015-07-28 10:58:17 -07:00
6e04af4b2f
Windows: Fix vendor-helpers.sh
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 663d50464e1932f924e875244783718699ca559f
Component: engine
2015-07-28 10:13:33 -07:00
39dd67d7c5
daemon/graphdriver/graphtest/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 12460f41a462b441d40db1a70165f7854f3fb77a
Component: engine
2015-07-28 06:01:00 +00:00
06f659e1d1
Remove references to boot2docker replace with docker-machine
...
- boot2docker is deprecated in the 1.8.0
- docker-machine replaces it
- this fixes #14563
- Updating with thaJetzah comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 1825e06944db20ec677aa8d26b36e9036b0dd257
Component: engine
2015-07-27 18:25:50 -07:00
6b7f5ef206
Merge pull request #14694 from Microsoft/10662-apparmorprofile
...
Windows: Factoring out unused fields
Upstream-commit: 4ed3e3a5b26a365e9b270011b0ba2b772fb98ab9
Component: engine
2015-07-27 18:18:54 -07:00
5acbf86531
Windows: Factoring out unused fields
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 47c56e4353792e16f994a35ea4063768bee6590e
Component: engine
2015-07-27 17:44:18 -07:00
6ceeb0ed2b
Fix golint nit in term_windows.go
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 35e498beca13de4ef8cecf45c0d132cc38daf0d5
Component: engine
2015-07-27 17:40:49 -07:00
809c751de2
Merge pull request #14838 from Microsoft/10662-ansirewrite
...
Windows: CLI Improvement (TP3)
Upstream-commit: 33358f80e592686bb1872d9d50a4dd1e0391487f
Component: engine
2015-07-27 17:30:14 -07:00
6075d6d732
Merge pull request #15034 from aaronlehmann/update-vendored-distribution
...
Update vendored distribution repo to new version
Upstream-commit: f32cab874c73c6c73629bc1227bc7adc35c15258
Component: engine
2015-07-27 17:24:35 -07:00
6ffaac6b6e
Merge pull request #15062 from chrisseto/master
...
Skip DockerSuite.TestExecResizeImmediatelyAfterExecStart on lxc
Upstream-commit: f3c23fc463f562da742d3888dd929a164cfe74a0
Component: engine
2015-07-27 17:20:20 -07:00
6f7ccf2956
Skip DockerSuite.TestExecResizeImmediatelyAfterExecStart on lxc
...
Signed-off-by: Chris Seto <chriskseto@gmail.com >
Upstream-commit: 83cb28857551d0077b3877d1de1c3c44a39da705
Component: engine
2015-07-27 19:20:15 -04:00
dde2806e53
Merge pull request #15059 from calavera/fix_overlay_comments_typo
...
Fix typo in overlay's create godoc.
Upstream-commit: 7886056d74f902a82b56e1f3bf1a27cc70952bbe
Component: engine
2015-07-27 15:40:22 -07:00
b123b9f21b
Fix typo in overlay's create godoc.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 5bac5302e59f0759545910ef748cc9a6f87db5c5
Component: engine
2015-07-27 15:37:26 -07:00
3d5c90498b
Merge pull request #14759 from vdemeester/pkg-golint
...
golint on some pkg/* packages
Upstream-commit: 25c42cc0d0a83325817e5fdb8fa654c9e5ab54d5
Component: engine
2015-07-27 15:19:46 -07:00
e075bafeec
Merge pull request #15039 from jlhawn/fix_build_context_is_symlink
...
[api/client] Fix build when context dir is symlink
Upstream-commit: bdc55be9b49bd4cdcc9373e2eb847b133532cedc
Component: engine
2015-07-27 15:11:36 -07:00
3363c19f5c
Merge pull request #15055 from calavera/log_release_steps
...
Log each release step.
Upstream-commit: 72afd792fd8dd080fa0fd6146ab78f334f697545
Component: engine
2015-07-27 15:03:29 -07:00
fc3779e694
Merge pull request #15051 from LK4D4/32bit_const
...
Use math.MaxInt32 instead of math.MaxUint32
Upstream-commit: 0fe564cbb6768c315da4f9476e8e035bac96d465
Component: engine
2015-07-27 15:02:40 -07:00
8743c4baf2
Merge pull request #14751 from vdemeester/runconfig-lint
...
golint fixes on runconfig
Upstream-commit: 542de786c2600f5936224308d293d25a588513a4
Component: engine
2015-07-27 15:01:08 -07:00
cf128458c4
Log each release step.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 776600fabbf52d21a061a9021011774d23df9b67
Component: engine
2015-07-27 14:28:05 -07:00
ddd991a6be
Merge pull request #14963 from MHBauer/plugins-links
...
Fix Plugins links
Upstream-commit: e5af7a0e869c0a66f8ab30d3a90280843b9999e0
Component: engine
2015-07-27 23:25:48 +02:00
4303d565ae
Merge pull request #15050 from DieterReuter/fix-bash-completion
...
Fix file mode for docker bash completion
Upstream-commit: df75411b0f5e7edf9139a913a05e3f8d717a65d2
Component: engine
2015-07-27 14:24:49 -07:00
26a080a43f
Merge pull request #15052 from MHBauer/ubuntu-docs
...
Fix interrupted numbering sequence in ubuntu installation docs
Upstream-commit: 967bc13ae68939c616033710f7695993aa4f5208
Component: engine
2015-07-27 22:45:51 +02:00
905c09e034
Use math.MaxInt32 instead of math.MaxUint32
...
I think it was original intention, because even half of a comment was about
MaxInt32.
Fix #15038
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: eb45602d2fa0fac8a694d2afb1c59ef60b0e1f77
Component: engine
2015-07-27 13:11:16 -07:00
9b82ceb5e0
Fix interrupted numbering sequence in ubuntu installation docs
...
- increase indent of note to match surrounding text
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 289e0d244bcbf98c064ce80dcad1a1985974a068
Component: engine
2015-07-27 13:10:29 -07:00
f1dcd8a79e
Fix file mode for docker bash completion
...
A bash completion file shouldn't have a executable bit set.
Just change file mode to 644 (instead of 755).
Signed-off-by: Dieter Reuter <dieter.reuter@me.com >
Upstream-commit: 37169daddabe19754659d8e28aaa1bf4f31c6124
Component: engine
2015-07-27 22:07:04 +02:00
c3325b7678
Merge pull request #15045 from cpuguy83/fix_dockercmdwitherror
...
Don't pass check.C to dockerCmdWithError
Upstream-commit: 8c9cd0418d1baa5ceddec58e3a4873607e9cafcd
Component: engine
2015-07-27 16:04:16 -04:00
1afac43bc7
Merge pull request #15041 from runcom/remove-saucy-from-installation-guide
...
Remove Ubuntu Saucy 13.10 from Ubuntu installation guide
Upstream-commit: 8492e62306166fa8d79ecf6eb95186933bbeaa09
Component: engine
2015-07-27 21:39:55 +02:00
2db54e3ac2
Lint on pkg/* packages
...
- pkg/useragent
- pkg/units
- pkg/ulimit
- pkg/truncindex
- pkg/timeoutconn
- pkg/term
- pkg/tarsum
- pkg/tailfile
- pkg/systemd
- pkg/stringutils
- pkg/stringid
- pkg/streamformatter
- pkg/sockets
- pkg/signal
- pkg/proxy
- pkg/progressreader
- pkg/pools
- pkg/plugins
- pkg/pidfile
- pkg/parsers
- pkg/parsers/filters
- pkg/parsers/kernel
- pkg/parsers/operatingsystem
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 18c7c67308bd4a24a41028e63c2603bb74eac85e
Component: engine
2015-07-27 21:26:21 +02:00
b61648e148
Lint fixes on runconfig
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5170a2c096ff64d4bfbe0fab296ec6777c412bc3
Component: engine
2015-07-27 21:23:15 +02:00
07ad6dff5c
Merge pull request #14923 from Djelibeybi/fix14905
...
Switch to using only the RPM command to determine the distro version.
Upstream-commit: 0852170e8c9787bf277b054ef08ed2c038a40dec
Component: engine
2015-07-27 12:01:57 -07:00
a5d4f063b0
[api/client] Fix build when context dir is symlink
...
Symbolic links in the context directory path are now evaluated.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 01d570ad30a794f2736b679700af91625e61bc85
Component: engine
2015-07-27 12:01:13 -07:00
6f5eddf659
Merge pull request #15044 from jlhawn/fix_15042
...
[integration-cli] fix windows build test cases
Upstream-commit: d0215376f838c73b9684f34584e63908fdeca281
Component: engine
2015-07-27 11:47:56 -07:00
6e14356132
Don't pass check.C to dockerCmdWithError
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 693ba98cb9118bf15caaabc69ca281c0ce604226
Component: engine
2015-07-27 14:33:32 -04:00
083f0a374e
[integration-cli] fix windows build test cases
...
Use the same IP as the DOCKER_HOST when making a remote file server.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: d06ffd0a5f5d55dacc369fc6560316e9f17e2cac
Component: engine
2015-07-27 11:30:38 -07:00
2c72388c36
Merge pull request #15026 from duglin/Issue14837
...
Add a test for using -f w/git repo on build
Upstream-commit: afac39d3082febd5c0270f7d19cb6c7512002f7d
Component: engine
2015-07-27 10:55:47 -07:00
c72e1b691a
Remove Ubuntu Saucy 13.10 from Ubuntu installation guide
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 1e43ce350d0715c0316294a2b4cc03f18213c631
Component: engine
2015-07-27 19:55:26 +02:00
0579fb2aaa
Merge pull request #15031 from liubin/typo/liubin-change-restart-command
...
Change restarting Docker daemon command in CentOS
Upstream-commit: db647c3b603ed6cd4a792473ab6e88304d38a07a
Component: engine
2015-07-27 10:54:55 -07:00
1b5a1d2d53
Merge pull request #14547 from duglin/ErrDeadExec
...
Return 404 on exec-inspect when container is dead but exec is still around
Upstream-commit: 4dbdd98b4142dbda1c6028c17a9a0d6dd8cdce04
Component: engine
2015-07-27 10:46:32 -07:00
820dfff766
Merge pull request #13834 from hqhq/hq_memswap_change
...
Set default MemorySwap on Docker side
Upstream-commit: 6e1d887722d2ce56c67f2d85b78a69672952e3a7
Component: engine
2015-07-27 10:46:10 -07:00
6356a946a6
Merge pull request #14118 from mountkin/fix-rmi-force
...
raise an error if rmi -f with multiple tags and running container
Upstream-commit: 33bd41df94a3fa81e3b011602008a31a57a5ca68
Component: engine
2015-07-27 10:42:07 -07:00
912083897d
Merge pull request #14278 from squaremo/separate_overlay_docs
...
Put the network UI and overlay docs in separate files
Upstream-commit: a62dabe0b4324475c24f1835d788af49d819aafa
Component: engine
2015-07-27 10:41:17 -07:00
2203799750
Merge pull request #14560 from bkeyoumarsi/volume-plugin-doc-fix
...
Updated volume-driver plugin api docs
Upstream-commit: fdb932fa17f4af2d54d3ceecc753e841242f8b1c
Component: engine
2015-07-27 10:39:15 -07:00
4f0e936463
Merge pull request #14735 from charleswhchan/patch-1
...
Minor edits to Environment variables section
Upstream-commit: f3af9c8bdb68e5db7aaed7aec11aa2a78fd7e546
Component: engine
2015-07-27 10:37:39 -07:00
58f2d2b582
Merge pull request #14852 from rhatdan/relabel
...
Rename internal field Relabel to Mode
Upstream-commit: 2f5dc43ca204c5d6e48abf5f64a46e150f3d0bfd
Component: engine
2015-07-27 10:31:08 -07:00
7e7519f5f0
Merge pull request #14875 from brahmaroutu/lint_daemon_graphdriver_btrfs
...
daemon/graphdriver/btrfs fix lint errors/warnings
Upstream-commit: 303345dc6a5179684bfe5f78ad9b3d73aba93d0e
Component: engine
2015-07-27 10:28:50 -07:00
6f66e6db3b
Merge pull request #14899 from mountkin/fix-exec-resize-panic
...
fix the panic caused by resizing a starting exec
Upstream-commit: 70842ea942326b2a3be3b504a7f5038ba68f07f1
Component: engine
2015-07-27 10:27:29 -07:00
1237e8ea97
Merge pull request #14959 from runcom/remove-pkg-systemd-booted-go
...
Remove pkg/systemd/booted.go
Upstream-commit: b48b6de623cb45509e4cf45d3b5b1b5d29a7e9d9
Component: engine
2015-07-27 10:22:58 -07:00
e610dff696
Merge pull request #14971 from moxiegirl/man-page-carry-14637
...
Carry man page for the load command
Upstream-commit: 5329d28536c5b75a42d5cb54a5b21e1f8791e914
Component: engine
2015-07-27 10:18:44 -07:00
9093f9669d
Merge pull request #14981 from calavera/bump_api_version
...
Bump api version to 1.21.
Upstream-commit: 912bafcf3636ce1de242177a144c727e965b97be
Component: engine
2015-07-27 10:17:24 -07:00
