David Calavera
eacedcbe21
Merge pull request #18831 from calavera/test_event_observer
...
Extract event processing to a common function for testing.
2015-12-22 15:04:32 -08:00
Sebastiaan van Stijn
45033c0bde
Merge pull request #18757 from thaJeztah/patch-release-process
...
Document process for patch-releases
2015-12-22 23:42:34 +01:00
Arnaud Porterie
319d488e6e
Merge pull request #18858 from thaJeztah/adieu-vieux
...
Move Victor to alumni
2015-12-22 14:38:54 -08:00
Alexander Morozov
030347c3c9
Merge pull request #18762 from calavera/runconfig_to_types
...
Move container configuration types to api/types/container.
2015-12-22 14:22:08 -08:00
Ying Li
203adfc13c
Add basic tests for passphrase retriever to make sure it handles delegations.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-12-22 14:14:10 -08:00
David Calavera
af51df20bd
Extract event processing to a common function for testing.
...
We keep only one logic to test event related behavior that will help us
diagnose flacky event errors.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-22 17:10:06 -05:00
Daniel Nephin
0673361ef6
Remove migrateIfDownlevel and aufs migration from docker pre-0.7
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-22 16:45:42 -05:00
Alexander Morozov
9f228b37fc
Merge pull request #18857 from calavera/catch_pipeline_error
...
Catch command pipeline error.
2015-12-22 13:34:56 -08:00
Jana Radhakrishnan
f0904affd1
libnetwork vendoring
...
Vendoring libnetwork @ 9f0563ea8f430d8828553aac97161cbff4056436
Brings in:
* Support for overlay network driver in 3.10+ kernels
* Freebsd compilation fixes
* Remove .dockerinit dependency
* IPAM driver capability support
* Network internal mode support
* Misc. fixes
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-12-22 13:32:17 -08:00
Tianon Gravi
0bbed98bc0
Merge pull request #18856 from albers/completion-network-rm
...
remove `--format` from bash completion for `docker network rm`
2015-12-22 12:38:11 -08:00
DJ Enriquez
5dfc78997d
Adding suggested changes
...
Adding changed suggested by moxiegirl.
Signed-off-by: DJ Enriquez <dj.enriquez@infospace.com >
2015-12-22 11:33:28 -09:00
Alexander Morozov
9c89e83ff1
Merge pull request #18855 from rhatdan/volume-tmpfs
...
No options to tmpfs is valid
2015-12-22 12:24:51 -08:00
David Calavera
f38257308b
Catch command pipeline error.
...
Rather than ignoring errors in the pipeline, return an execution error
and do not proceed with the latest command in the pipeline.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-22 15:17:15 -05:00
Harald Albers
f03695efc1
remove --format from bash completion for docker network rm
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-12-22 11:35:41 -08:00
David Calavera
01cfa62856
Merge pull request #46 from thaJeztah/add-new-projects
...
Add go-connections, go-units
2015-12-22 11:29:55 -08:00
Dan Walsh
89a775d2dc
No options to tmpfs is valid
...
If you run a
docker run command with --tmpfs /mountpoint:noexec
Or certain options that get translated into mount options, the mount command can get passed "" for mount data.
So this should be valid.
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
2015-12-22 14:15:07 -05:00
David Calavera
7ac4232e70
Move Config and HostConfig from runconfig to types/container.
...
- Make the API client library completely standalone.
- Move windows partition isolation detection to the client, so the
driver doesn't use external types.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-22 13:34:30 -05:00
David Calavera
747dccde41
Remove usage of runconfig.ConvertKVStringsToMap in the API client library.
...
It's a very simple function that we can duplicate.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-22 13:31:46 -05:00
David Calavera
839f73c302
Move ExecConfig to types.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-22 13:31:46 -05:00
David Calavera
056e744903
Replace usage of pkg/nat with go-connections/nat.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-22 13:31:46 -05:00
David Calavera
0aab83d996
Move blkiodev package to types.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-22 13:31:46 -05:00
David Calavera
ad7fa01102
Vendor new connections library.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-22 13:31:46 -05:00
David Calavera
f9b857a200
Move StrSlice to types.
...
This is a very docker concept that nobody elses need.
We only maintain it to keep the API backwards compatible.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-22 13:31:43 -05:00
Olivier Gambier
e02a0b0399
Merge pull request #1244 from carsonoid/carsonoid-nginx-doc-patch
...
Update nginx.md
2015-12-22 10:25:10 -08:00
Olivier Gambier
236c19fa30
Merge pull request #1255 from donhcd/convergeSwiftDocs
...
Help converge disagreeing swift docs
2015-12-22 10:23:13 -08:00
Olivier Gambier
29213af431
Merge pull request #1294 from rhcarvalho/patch-1
...
Fix godoc
2015-12-22 10:15:51 -08:00
Jess Frazelle
812aa04350
Merge pull request #48 from thaJeztah/add-alumni
...
Add Alumni rule
2015-12-22 10:09:09 -08:00
Fabio Rapposelli
e7c0ebab5e
Dependencies update
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com >
2015-12-22 19:00:45 +01:00
Fabio Rapposelli
2e90b7cb55
Update vSphere driver to work with govmomi instead of wrapping govc.
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com >
2015-12-22 19:00:45 +01:00
Jess Frazelle
81c8e4d4c8
Merge pull request #18765 from Mashimiao/update-blkio-weight-device-test
...
update Blkio Tests name
2015-12-22 09:53:22 -08:00
Antonio Murdaca
ac1187dc8d
Merge pull request #18844 from hqhq/hq_mv_oom_disable
...
Move OomKillDisable to resource
2015-12-22 18:52:24 +01:00
Jess Frazelle
ff796e5bf7
Merge pull request #18837 from thaJeztah/remove-darwin-i386
...
Don't build Darwin 32-bit binaries
2015-12-22 09:51:29 -08:00
Jess Frazelle
b5fb5b9d00
Merge pull request #18851 from thaJeztah/update-contributing
...
Update contributing.md
2015-12-22 09:49:53 -08:00
Sebastiaan van Stijn
61e28f17a3
Merge pull request #18852 from errordeveloper/master
...
Update link for Weave Net plugin docs
2015-12-22 18:32:38 +01:00
David Gageot
1976613fa8
Merge pull request #2659 from dgageot/powershell-env
...
Fix Powershell env hints
2015-12-22 18:26:20 +01:00
Ilya Dmitrichenko
45241d36d3
Update link for Weave Net plugin docs
...
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com >
2015-12-22 16:45:54 +00:00
David Calavera
5b913de5e6
Merge pull request #18847 from albers/completion-rename-functions
...
Better function names in bash completion
2015-12-22 08:43:08 -08:00
Tianon Gravi
eafecff258
Merge pull request #18821 from oyld/script_fix
...
Fix syntax error in init script
2015-12-22 06:48:22 -08:00
Sebastiaan van Stijn
6150157e8f
Update contributing.md
...
- Add a link to the new procedures for adding maintainers
- Remove section about monthly IRC meetings, which are in flux
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-12-22 15:42:36 +01:00
David Gageot
1744bf4fd7
Fix Powershell env hints
...
Signed-off-by: David Gageot <david@gageot.net >
2015-12-22 15:18:09 +01:00
Sebastiaan van Stijn
ff3687c965
Move Victor to alumni
...
Victor is now a maintainer for Docker Swarm, and no
longer active as a maintainer for this repository.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-12-22 15:00:21 +01:00
David Gageot
ee8c9abed2
Merge pull request #2654 from dgageot/2140_driver_restart
...
Change host restart to use the driver implementation
2015-12-22 14:32:49 +01:00
Sebastiaan van Stijn
f4419e3735
Add Alumni rule
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-12-22 14:21:20 +01:00
Jean-Laurent de Morlhon
e22f1db4bf
Merge pull request #2657 from dgageot/improve-generic-driver
...
Improve generic driver
2015-12-22 14:13:22 +01:00
Jean-Laurent de Morlhon
7d72a7824d
Merge pull request #2656 from dgageot/missing-quotes
...
FIX #2655 Add quotes to the eval cmdline if there are spaces in the path
2015-12-22 14:12:58 +01:00
Jean-Laurent de Morlhon
643df3c0a7
Merge pull request #2589 from boyvinall/mv/filter-openstack-floating
...
Filter openstack floating IPs by tenant ID
2015-12-22 14:12:21 +01:00
Harald Albers
e715daab3d
Better function names in bash completion
...
The new names make it easier to distinguish between helper functions and
functions that actually perform completion by modifying the global COMPOPT
variable.
Signed-off-by: Harald Albers <github@albersweb.de >
2015-12-22 13:38:02 +01:00
oyld
bbbc01b86e
Fix syntax error in init script
...
Signed-off-by: oyld <oyld0210@163.com >
2015-12-22 04:00:00 -08:00
Rodolfo Carvalho
e0fe14618f
Fix godoc
...
`RepositoryNameTotalLengthMax` doesn't exist anymore.
Signed-off-by: Rodolfo Carvalho <rhcarvalho@gmail.com >
2015-12-22 12:26:05 +01:00
David Gageot
cdfa729f36
Simplify code
...
Signed-off-by: David Gageot <david@gageot.net >
2015-12-22 12:04:46 +01:00