63f5d12fc4
Merge pull request #16320 from 0xfoo/remove-unused-var
...
Remove unused variable, fix #16310
Upstream-commit: bfc4e38429baec7414364bbe20787245d3f2b432
Component: engine
2015-09-16 13:17:10 -07:00
5e58ae50d3
Merge pull request #15786 from HuKeping/stats-network
...
Refactor the statistics of network in docker stats
Upstream-commit: 259a0fb16ceac921763172127183059dea7e3c46
Component: engine
2015-09-16 20:29:16 +02:00
5b99d6a57b
Merge pull request #16292 from tpounds/fix-doc-typo
...
Fix minor documentation typo.
Upstream-commit: 60db152b209ede8e463b74459902f02d8d44e097
Component: engine
2015-09-16 11:18:17 -07:00
da0763c0bb
Merge pull request #16347 from jfrazelle/revert-ulp
...
Revert "Make daemon to start with no userlandproxy by default"
Upstream-commit: 552c361f3988993c43698fdaa8607a2830c9f567
Component: engine
2015-09-16 10:01:11 -07:00
fd675380c0
Revert "Make daemon to start with no userlandproxy by default"
...
This reverts commit bf2b8ec8165468d7454f6bd86f4a78e7e8b58d8e.
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 50d7fba7758e8890d49f492c284262ec9aa22190
Component: engine
2015-09-16 09:56:38 -07:00
c99dd532dd
Merge pull request #16309 from LK4D4/fix_volumes_race
...
volumes: add synchronization to Count and List
Upstream-commit: 7b1930063fcf6eda698ef93989a35657a0644cf5
Component: engine
2015-09-16 11:28:51 -04:00
58d500daa7
Merge pull request #16314 from Microsoft/10662-stopsignal2
...
Windows: Turn off TestBuildStopSignal
Upstream-commit: e0fee019ca4a961149ea9bb6210ed5a4c8c5ab17
Component: engine
2015-09-16 09:42:01 -04:00
3a894b4cd3
Merge pull request #16291 from mikebrow/readme-updates-for-man-pages
...
updates to readme documents for manual page
Upstream-commit: 606c6e8f57dd32b041364af019b681cf1d44669b
Component: engine
2015-09-15 15:18:19 -07:00
bf1f233fb1
Merge pull request #16324 from calavera/update_changelog
...
Update changelog for version 1.8.2.
Upstream-commit: be082715c7184df185bfde0acaccdbdf2460779d
Component: engine
2015-09-15 14:51:53 -07:00
de4b1f5bc6
Update changelog for version 1.8.2.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3b7cdfcd6b7a1c22a8318afaac16e5328b56ff1f
Component: engine
2015-09-15 17:43:37 -04:00
8d4c894e27
Remove unused variable, fix #16310
...
Signed-off-by: Christian Rotzoll <ch.rotzoll@gmail.com >
Upstream-commit: 9c9b748ad8fefb059d0c6bf585593ae1b623cc51
Component: engine
2015-09-15 22:20:10 +02:00
fa3b248d8f
Windows: Turn off TestBuildStopSignal
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6167c7bfb8431e5e83130fd44bd36d75da488b21
Component: engine
2015-09-15 11:56:54 -07:00
8dd1931b2b
volumes: add synchronization to Count and List
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 2d21996eec8d3e6100f19fa0d0fa7adad25285ca
Component: engine
2015-09-15 10:38:53 -07:00
361f21e647
updates to readme documents for manual page
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
Upstream-commit: 96699e06dd05bef436c0b9e9df64f102c44e7329
Component: engine
2015-09-15 12:08:02 -05:00
19987593e7
Merge pull request #16285 from calavera/cleanup_volumes_when_create_fails
...
Remove volume references when container creation fails.
Upstream-commit: 59311faaed4e3384fc8da738a57a25f17ae07e05
Component: engine
2015-09-15 10:55:51 -04:00
700bfcfe4a
Merge pull request #15069 from duglin/UseErrorPackage
...
Use the new error package
Upstream-commit: e91f2c26ce38787e159162d2c4a43744396e3308
Component: engine
2015-09-15 09:28:53 -04:00
852d9066b4
Merge pull request #16275 from coolljt0725/fix_register_failed_and_start
...
Fix container register failed during daemon start and then start the container
Upstream-commit: db2ac8655d046b97b33636077faa420a700d8bfc
Component: engine
2015-09-15 11:46:03 +02:00
5562327b20
Merge pull request #16279 from coolljt0725/clean_up
...
Clean up: remove redundant value assign in runconfig/parse.go
Upstream-commit: 0d873f6e708913fcfa8ba2c6fcb57872cbaafbc9
Component: engine
2015-09-15 11:43:38 +02:00
c71aa53e3d
Refactor the statistics of network in docker stats
...
For now docker stats will sum the rxbytes, txbytes, etc. of all
the interfaces.
It is OK for the output of CLI `docker stats` but not good for
the API response, especially when the container is in sereval
subnets.
It's better to leave these origianl data to user.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: d3379946ec96fb6163cb8c4517d7d5a067045801
Component: engine
2015-09-15 15:40:34 +08:00
e0de6dc515
Merge pull request #16295 from BWITS/master
...
typo
Upstream-commit: 99b40d1e149157de06065c1cc92c23c2b07706ee
Component: engine
2015-09-15 08:42:04 +02:00
36a12430ca
Merge pull request #16282 from mavenugo/ln_uns
...
Vendor-in libnetwork 2baa2ddc78b42f011f55633282ac63a72e1b09c1
Upstream-commit: 370ca6e401b251085a33f50e842f6567d2e9924e
Component: engine
2015-09-14 22:18:50 -04:00
826aca1e6d
typo
...
Signed-off-by: Bill Wang <ozbillwang@gmail.com >
Upstream-commit: 386b7bc71b07ee2317266ba64c0d59642b4042ab
Component: engine
2015-09-15 11:58:20 +10:00
943e453907
Merge pull request #16197 from aaronlehmann/carry-15539
...
Carry #15539 : Avoid redundant HEAD requests on push
Upstream-commit: 58d6919183f9e796b1d3462fa79ce30fc0b72082
Component: engine
2015-09-14 17:15:32 -07:00
b8f6767a06
Fix minor documentation typo.
...
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com >
Upstream-commit: 2eedaf0389f663c8768893cd333cdd6df9e194e2
Component: engine
2015-09-14 17:08:04 -07:00
4af52a5987
Merge pull request #16283 from nalind/journald-not-nil
...
Remove unnecessary check for nil CString
Upstream-commit: a90ed92df0b55cea8d2cf64858db10aeacf6775c
Component: engine
2015-09-14 19:45:36 -04:00
1f4f6c3414
Merge pull request #15931 from vdemeester/api-client-ps-coverage
...
Add more unit tests on api/client/ps package
Upstream-commit: 7ce270d4ea17d5ec01fe00581fbabf4c5274f0e1
Component: engine
2015-09-14 14:02:49 -07:00
ad942e9805
Merge pull request #16247 from calavera/unexport_volumedriver_interface
...
Unexport VolumeDriver.
Upstream-commit: bda964d0859157bb25d1579cbd3e45b005a072e7
Component: engine
2015-09-14 13:47:00 -07:00
bfef76b67b
Remove volume references when container creation fails.
...
Volumes are accounted when a container is created.
If the creation fails we should remove the reference from the counter.
Do not log ErrVolumeInUse as an error, having other volume references is
not an error.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 2c6c07752c8d89fa72249c24285ede1b4e579b24
Component: engine
2015-09-14 16:16:46 -04:00
1c2bc6c79f
Merge pull request #16276 from Mashimiao/typo-fix-opts-split
...
opts/opts.go: fix typo
Upstream-commit: fedecb8c916bea9a737d992012133f05ccf7c954
Component: engine
2015-09-14 13:12:16 -07:00
bb8ff26c08
Use the new error package
...
This is the first step in converting out static strings into well-defined
error types. This shows just a few examples of it to get a feel for how things
will look. Once we agree on the basic outline we can then work on converting
the rest of the code over.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 628b9a41b09fde3ce1493f7d4f1495b9afaa506c
Component: engine
2015-09-14 13:11:01 -07:00
7d3bcc0ea2
Remove unnecessary check for nil CString
...
@noxiouz points out that we don't need to check for a nil result from
C.CString(), since an out-of-memory condition causes a runtime panic
instead.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com > (github: nalind)
Upstream-commit: 11fda783f85e1f6027c997c6b044c65288c89099
Component: engine
2015-09-14 14:16:48 -04:00
7c0ce8d93c
Vendor-in 2baa2ddc78b42f011f55633282ac63a72e1b09c1 for userns support
...
Changes include :
* libnetwork support for userns
* driver api change to have 1 interface per endpoint
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: d0e0c13b603efaff14c0269d19ac7e3710307fab
Component: engine
2015-09-14 11:04:12 -07:00
03b8b15474
Merge pull request #16274 from opreaadrian/rest-api-documentation-syntax-error
...
Rest api documentation syntax error
Upstream-commit: 084f8060e28842fa6d23aa8b83ea357a2650cc41
Component: engine
2015-09-14 19:40:59 +02:00
6b4c313413
Merge pull request #15886 from xiekeyang/master
...
Fix: Docker Daemon didn't send actual actions client ask for to Token Server
Upstream-commit: d25dada639fe475ff6496b1d357d2250a0e014e3
Component: engine
2015-09-14 09:47:19 -07:00
203dc7867a
Merge pull request #16253 from AmeBel/update-documentation-on-run
...
add a documentation note on backslash usage in shell form of RUN
Upstream-commit: 621143a6413dcc0cdd347cc91081e2865fe505fb
Component: engine
2015-09-14 06:32:20 -07:00
43cb20e54c
Clean up: remove redundant value assign in runconfig/parse.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 5575b9367832b22a3103b697a2ef8ffaf0b95944
Component: engine
2015-09-14 08:30:11 -04:00
a212a2f525
update documentation styling as per suggestions
...
Signed-off-by: Amen Belayneh <amenbelayneh@gmail.com >
Upstream-commit: 30164588d6be5d5a07b079719f15cf2da06322d2
Component: engine
2015-09-14 19:08:27 +08:00
c88accb730
Fix typos in REST API documentation
...
Replace comma with column
Remove extra curly brace
Fix typo in REST API documentation
Replace comma with column in documentation.
Signed-off-by: Adrian Oprea <adrian@codesi.nz >
Remove extra curly brace
Remove extra curly brace from remote API docs.
Signed-off-by: Adrian Oprea <adrian@codesi.nz >
Upstream-commit: 18d856f55adfd37da5023867e9a63bbfe331dc01
Component: engine
2015-09-14 11:18:41 +03:00
28aab5a3bf
opts/opts.go: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 185544a4fede739bfd85633f18bf71a6f3deafd9
Component: engine
2015-09-14 14:48:09 +08:00
2cfd978e65
Fix container register failed during daemon start and try to start the container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: b4841dd2371cdab8ef6e01d8304622fdb3578644
Component: engine
2015-09-13 22:52:56 -04:00
357f37d8f7
Merge pull request #16244 from calavera/libcontainer_0_0_4
...
Vendor libcontainer v0.0.4
Upstream-commit: dac92a8afbe0900641afa00e33e84e180d432239
Component: engine
2015-09-13 22:24:44 -04:00
0982faaaa2
Merge pull request #16241 from jaxgeller/fix-installation-docs
...
fix typo and cleanup docs for installation.
Upstream-commit: 21cc0ac2c60fd63cfb2041236a84d89c68fdb284
Component: engine
2015-09-14 09:23:33 +10:00
f496a3a517
Merge pull request #16268 from charleswhchan/fix-ubuntu-doc
...
Fix Ubuntu instalation doc.
Upstream-commit: 25eb1016243cfd4a05ebc23c8362b0f2edb0e87d
Component: engine
2015-09-14 00:11:16 +02:00
b962eefd8c
Fix Ubuntu instalation doc.
...
Formatting, break `sudo ...` command into 2 lines.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 6b16c154f56f2b4b62d623ce140ed2bb8994a1f2
Component: engine
2015-09-13 13:29:50 -07:00
606a0a3218
Merge pull request #16254 from dgageot/patch-5
...
Fix typo in ROADMAP.md
Upstream-commit: 611dbd8957581fa451a4103259100a5e2d115b8c
Component: engine
2015-09-12 06:15:00 -04:00
fd5f304706
Fix typo in ROADMAP.md
...
Signed-off-by: David Gageot <david@gageot.net >
Upstream-commit: 02e18c9ab31cbb7033ec6efebc12274cd7b50e62
Component: engine
2015-09-12 11:27:46 +02:00
66cf279f4c
add a documentation note on backslash usage in shell form of RUN
...
Signed-off-by: Amen Belayneh <amenbelayneh@gmail.com >
Upstream-commit: 6a55d953349eddaf502ff2db6c727e97a5dde3db
Component: engine
2015-09-12 15:42:18 +08:00
f294888a6f
Merge pull request #16100 from ZJU-SEL/fix-document-about-vol
...
fix doc about vol
Upstream-commit: 9d0954a83d6c7b52287a62f8ab7ad42d544322a0
Component: engine
2015-09-12 02:50:49 +02:00
8ad4ad2e7a
Unexport VolumeDriver.
...
This is not a public interface and users are trying to use it.
We only use it to be able to generate the rpc protocol to talk with a plugin.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 69dde5c0759a9ce686d9b10eb160e6d561322409
Component: engine
2015-09-11 18:19:38 -04:00
bc5adf9c08
Merge pull request #13707 from nalind/journald-logs
...
Implement the "logs" endpoint for the journald log driver
Upstream-commit: 7fc4566c9dc6ee5d10b15a3c813ff1381657a147
Component: engine
2015-09-11 14:38:33 -07:00
