David Calavera
c1e59b94e2
Merge pull request #16345 from albers/completion-extglob-fix
...
[Fix 16326] Bash completion syntax error on OSX
2015-09-16 13:43:02 -07:00
Jess Frazelle
74a8f2f668
Merge pull request #15861 from brahmaroutu/gccgo_x86
...
Enable building Docker with gcc-go on x86
2015-09-16 13:29:02 -07:00
David Calavera
bfc4e38429
Merge pull request #16320 from 0xfoo/remove-unused-var
...
Remove unused variable, fix #16310
2015-09-16 13:17:10 -07:00
Srini Brahmaroutu
2c53643b33
adding a Dockerfile.gccgo to use gccgo compiler instead of go compiler.
...
temporarily disabling registry builds as crypto package is broken with gccgo.
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-09-16 18:56:01 +00:00
Sebastiaan van Stijn
259a0fb16c
Merge pull request #15786 from HuKeping/stats-network
...
Refactor the statistics of network in docker stats
2015-09-16 20:29:16 +02:00
David Calavera
60db152b20
Merge pull request #16292 from tpounds/fix-doc-typo
...
Fix minor documentation typo.
2015-09-16 11:18:17 -07:00
David Calavera
552c361f39
Merge pull request #16347 from jfrazelle/revert-ulp
...
Revert "Make daemon to start with no userlandproxy by default"
2015-09-16 10:01:11 -07:00
Jessica Frazelle
50d7fba775
Revert "Make daemon to start with no userlandproxy by default"
...
This reverts commit bf2b8ec816
.
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-16 09:56:38 -07:00
Harald Albers
0a5aac1ff6
Fix bash completion when extglob is not set
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-16 18:17:40 +02:00
Brian Goff
7b1930063f
Merge pull request #16309 from LK4D4/fix_volumes_race
...
volumes: add synchronization to Count and List
2015-09-16 11:28:51 -04:00
Brian Goff
e0fee019ca
Merge pull request #16314 from Microsoft/10662-stopsignal2
...
Windows: Turn off TestBuildStopSignal
2015-09-16 09:42:01 -04:00
moxiegirl
606c6e8f57
Merge pull request #16291 from mikebrow/readme-updates-for-man-pages
...
updates to readme documents for manual page
2015-09-15 15:18:19 -07:00
Jess Frazelle
be082715c7
Merge pull request #16324 from calavera/update_changelog
...
Update changelog for version 1.8.2.
2015-09-15 14:51:53 -07:00
David Calavera
3b7cdfcd6b
Update changelog for version 1.8.2.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-15 17:43:37 -04:00
Christian Rotzoll
9c9b748ad8
Remove unused variable, fix #16310
...
Signed-off-by: Christian Rotzoll <ch.rotzoll@gmail.com>
2015-09-15 22:20:10 +02:00
John Howard
6167c7bfb8
Windows: Turn off TestBuildStopSignal
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-15 11:56:54 -07:00
Alexander Morozov
2d21996eec
volumes: add synchronization to Count and List
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-15 10:38:53 -07:00
Mike Brown
96699e06dd
updates to readme documents for manual page
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2015-09-15 12:08:02 -05:00
Brian Goff
59311faaed
Merge pull request #16285 from calavera/cleanup_volumes_when_create_fails
...
Remove volume references when container creation fails.
2015-09-15 10:55:51 -04:00
Brian Goff
e91f2c26ce
Merge pull request #15069 from duglin/UseErrorPackage
...
Use the new error package
2015-09-15 09:28:53 -04:00
Antonio Murdaca
db2ac8655d
Merge pull request #16275 from coolljt0725/fix_register_failed_and_start
...
Fix container register failed during daemon start and then start the container
2015-09-15 11:46:03 +02:00
Antonio Murdaca
0d873f6e70
Merge pull request #16279 from coolljt0725/clean_up
...
Clean up: remove redundant value assign in runconfig/parse.go
2015-09-15 11:43:38 +02:00
Hu Keping
d3379946ec
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>
2015-09-15 15:40:34 +08:00
Sebastiaan van Stijn
99b40d1e14
Merge pull request #16295 from BWITS/master
...
typo
2015-09-15 08:42:04 +02:00
Phil Estes
370ca6e401
Merge pull request #16282 from mavenugo/ln_uns
...
Vendor-in libnetwork 2baa2ddc78b42f011f55633282ac63a72e1b09c1
2015-09-14 22:18:50 -04:00
Bill W
386b7bc71b
typo
...
Signed-off-by: Bill Wang <ozbillwang@gmail.com>
2015-09-15 11:58:20 +10:00
Stephen Day
58d6919183
Merge pull request #16197 from aaronlehmann/carry-15539
...
Carry #15539 : Avoid redundant HEAD requests on push
2015-09-14 17:15:32 -07:00
Trevor Pounds
2eedaf0389
Fix minor documentation typo.
...
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>
2015-09-14 17:08:04 -07:00
Brian Goff
a90ed92df0
Merge pull request #16283 from nalind/journald-not-nil
...
Remove unnecessary check for nil CString
2015-09-14 19:45:36 -04:00
David Calavera
7ce270d4ea
Merge pull request #15931 from vdemeester/api-client-ps-coverage
...
Add more unit tests on api/client/ps package
2015-09-14 14:02:49 -07:00
David Calavera
bda964d085
Merge pull request #16247 from calavera/unexport_volumedriver_interface
...
Unexport VolumeDriver.
2015-09-14 13:47:00 -07:00
David Calavera
2c6c07752c
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>
2015-09-14 16:16:46 -04:00
David Calavera
fedecb8c91
Merge pull request #16276 from Mashimiao/typo-fix-opts-split
...
opts/opts.go: fix typo
2015-09-14 13:12:16 -07:00
Doug Davis
628b9a41b0
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>
2015-09-14 13:11:01 -07:00
Nalin Dahyabhai
11fda783f8
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)
2015-09-14 14:16:48 -04:00
Madhu Venugopal
d0e0c13b60
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>
2015-09-14 11:04:12 -07:00
Sebastiaan van Stijn
084f8060e2
Merge pull request #16274 from opreaadrian/rest-api-documentation-syntax-error
...
Rest api documentation syntax error
2015-09-14 19:40:59 +02:00
David Calavera
d25dada639
Merge pull request #15886 from xiekeyang/master
...
Fix: Docker Daemon didn't send actual actions client ask for to Token Server
2015-09-14 09:47:19 -07:00
moxiegirl
621143a641
Merge pull request #16253 from AmeBel/update-documentation-on-run
...
add a documentation note on backslash usage in shell form of RUN
2015-09-14 06:32:20 -07:00
Lei Jitang
5575b93678
Clean up: remove redundant value assign in runconfig/parse.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-09-14 08:30:11 -04:00
Amen Belayneh
30164588d6
update documentation styling as per suggestions
...
Signed-off-by: Amen Belayneh <amenbelayneh@gmail.com>
2015-09-14 19:08:27 +08:00
Adrian Oprea
18d856f55a
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>
2015-09-14 11:18:41 +03:00
Ma Shimiao
185544a4fe
opts/opts.go: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-09-14 14:48:09 +08:00
Lei Jitang
b4841dd237
Fix container register failed during daemon start and try to start the container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-09-13 22:52:56 -04:00
Phil Estes
dac92a8afb
Merge pull request #16244 from calavera/libcontainer_0_0_4
...
Vendor libcontainer v0.0.4
2015-09-13 22:24:44 -04:00
Sven Dowideit
21cc0ac2c6
Merge pull request #16241 from jaxgeller/fix-installation-docs
...
fix typo and cleanup docs for installation.
2015-09-14 09:23:33 +10:00
Sebastiaan van Stijn
25eb101624
Merge pull request #16268 from charleswhchan/fix-ubuntu-doc
...
Fix Ubuntu instalation doc.
2015-09-14 00:11:16 +02:00
Charles Chan
6b16c154f5
Fix Ubuntu instalation doc.
...
Formatting, break `sudo ...` command into 2 lines.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-13 13:29:50 -07:00
Doug Davis
611dbd8957
Merge pull request #16254 from dgageot/patch-5
...
Fix typo in ROADMAP.md
2015-09-12 06:15:00 -04:00
David Gageot
02e18c9ab3
Fix typo in ROADMAP.md
...
Signed-off-by: David Gageot <david@gageot.net>
2015-09-12 11:27:46 +02:00