David Gageot
291533a671
Merge pull request #2872 from jeanlaurent/itbugsnag
...
Fix #2863 - write IT test for bugsnag
2016-01-19 16:16:35 +01:00
Daniel Nephin
c47aea9c12
Merge pull request #2698 from aanand/fix-name-is-reserved
...
Fix "name is reserved" with Engine 1.10 RC1
2016-01-19 10:15:06 -05:00
Daniel Nephin
1be147f775
Merge pull request #2696 from aanand/test-external-default
...
Test that you can set the default network to be external
2016-01-19 10:09:42 -05:00
Tibor Vass
e8ce350669
Merge pull request #19424 from aaronlehmann/revert-multiple-pull-errors
...
Revert reporting of multiple pull errors
2016-01-19 09:51:54 -05:00
Jean-Laurent de Morlhon
872241e1ae
Fix #2863 - write IT test for bugsnag
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2016-01-19 15:20:27 +01:00
HuKeping
b044b65f4b
Comments: minor typo
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-01-19 20:33:36 +08:00
Aanand Prasad
2106481c23
Fix "name is reserved" with Engine 1.10 RC1
...
Ensure link aliases are unique (this deduping was previously performed
on the server).
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2016-01-19 11:27:27 +00:00
Aanand Prasad
5b2b4cbb07
Merge pull request #2692 from aanand/fix-tls-paramater-error
...
Catch TLSParameterErrors from docker-py
2016-01-19 11:25:21 +00:00
Aanand Prasad
746033ed9d
Test that you can set the default network to be external
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2016-01-19 10:57:12 +00:00
Aanand Prasad
413cdbcb81
Merge pull request #2675 from sdurrheimer/zsh-completion-up-abort-on-container-exit
...
Add zsh completion for 'docker-compose up --abort-on-container-exit'
2016-01-19 10:41:08 +00:00
Aanand Prasad
683c8b0067
Merge pull request #2676 from sdurrheimer/zsh-completion-down-command
...
Add zsh completion for 'docker-compose down'
2016-01-19 10:40:29 +00:00
Aanand Prasad
9d2e1f58d9
Merge pull request #2677 from sdurrheimer/zsh-completion-fix-invalid-commands-cache
...
Fix zsh completion to ensure we have enough commands to store in the …
2016-01-19 10:40:03 +00:00
Aanand Prasad
adedbee41b
Merge pull request #2694 from dnephin/release_script_fixes
...
Fix some bugs in release scripts
2016-01-19 10:39:06 +00:00
Jean-Laurent de Morlhon
b812fc9e2a
Merge pull request #2869 from dgageot/fix-typo
...
vbm.go typo
2016-01-19 10:33:35 +01:00
Vincent Demeester
011ca5f206
Merge pull request #19426 from sanimej/restart
...
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
2016-01-19 10:28:33 +01:00
Vincent Demeester
05e36d254f
Merge pull request #19437 from HackToday/fixulimit
...
Fix ulimit command form
2016-01-19 10:26:02 +01:00
Vincent Demeester
25f4f71512
Merge pull request #19436 from HackToday/fixhostdev
...
Fix add host device example
2016-01-19 10:25:08 +01:00
Sebastiaan van Stijn
0f04f3ba9f
Merge pull request #19433 from HackToday/fixclidoc
...
Fix the privileged example
2016-01-19 00:37:30 -08:00
Sebastiaan van Stijn
9c6e60b98a
Merge pull request #53 from thaJeztah/add-migrator
...
Add v1.10-migrator project
2016-01-19 00:28:32 -08:00
Sebastiaan van Stijn
02e4615929
Add v1.10-migrator project
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-01-19 00:25:50 -08:00
Henrik Nyh
3b90a2a0a2
vbm.go typo
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-19 08:52:28 +01:00
David Gageot
81a13c4af9
Merge pull request #2864 from nathanleclaire/deprecate_minus_d
...
Update CoreOS provisioner to use 'docker daemon'
2016-01-19 08:51:16 +01:00
David Gageot
4bd97a106a
Merge pull request #2865 from nathanleclaire/inspect_test
...
Add test for 'docker-machine inspect'
2016-01-19 08:50:26 +01:00
David Gageot
9603e2c2a3
Merge pull request #2868 from nathanleclaire/bump_dev_version_0.6.0-rc2
...
Bump version to 0.6.0-rc2-dev
2016-01-19 08:49:52 +01:00
David Gageot
3ba53a0869
Merge pull request #2867 from nathanleclaire/bump_changelog_0.6.0-rc1
...
Bump changelog for 0.6.0-rc1
2016-01-19 08:48:25 +01:00
Kai Qiang Wu(Kennan)
98e5a8efcc
Fix ulimit command form
...
The ulimit is builtin, so we need shell form to execute it.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
2016-01-19 07:44:58 +00:00
Antonio Murdaca
6a1100cafc
Merge pull request #19429 from mavenugo/epv21
...
nil ptr check for endpointsettings when used with older clients
2016-01-19 08:43:04 +01:00
Kai Qiang Wu(Kennan)
62b525f75d
Fix add host device example
...
The example is not right in parameter, and also
one command is same as first one, it should be typo
before, we should use 'rw' as example for that.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
2016-01-19 07:00:58 +00:00
Kai Qiang Wu(Kennan)
3cc5550003
Fix the privileged example
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
2016-01-19 06:41:49 +00:00
Lei Jitang
42ee908b3f
Merge pull request #19431 from WeiZhang555/19422-default-network
...
bugfix: prevent creating network 'default'
2016-01-19 14:18:20 +08:00
Jess Frazelle
27b76f031f
Merge pull request #52 from thaJeztah/add-go-plugins-helpers
...
Add go-plugins-helpers and update maintainers
2016-01-18 20:17:56 -08:00
yangshukui
d474f7fb86
remove the check of ContentLength in TestApiStatsNoStreamGetCpu
...
Signed-off-by: yangshukui <yangshukui@huawei.com >
2016-01-19 12:06:01 +08:00
Jeffrey Morgan
dd569065d8
Merge branch 'master' of github.com:docker/kitematic
2016-01-18 19:40:44 -08:00
Jeffrey Morgan
48b9be7ebf
Bump version to 0.9.6
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2016-01-18 19:40:38 -08:00
Jessica Frazelle
308eff99e8
add send, recv, and x32 so we can install i386 pkgs on amd64
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2016-01-18 19:24:01 -08:00
Zhang Wei
31dae442c8
bugfix: prevent creating network 'default'
...
Default is predefined network and is reserved, so we should stop user
from creating network with name `default`
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2016-01-19 11:06:36 +08:00
Jeffrey Morgan
d122fb9eb6
Merge pull request #1381 from docker/verify-vm
...
Properly verify that VM exists
2016-01-18 18:18:50 -08:00
Jeffrey Morgan
afda9d49c4
Properly verify that VM exists
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2016-01-18 18:06:33 -08:00
Jeffrey Morgan
df083d41f7
Fix circle.yml deployment
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2016-01-18 17:44:55 -08:00
Jeffrey Morgan
116ea7eb47
Deploy on tag
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2016-01-18 17:38:50 -08:00
Madhu Venugopal
35dbce109b
nil ptr check for endpointsettings when used with older clients
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2016-01-18 17:15:59 -08:00
Victor Vieux
05f9a6a6fb
Merge pull request #1654 from dongluochen/darwinbuild
...
Mac build fix
2016-01-18 17:13:00 -08:00
Brian Goff
b6be645197
Merge pull request #19420 from clnperez/close-notify-fix
...
Move closeNotify to fix panic with newer golang
2016-01-18 20:08:25 -05:00
Dong Chen
180bc90b1b
Mac build fix
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-01-18 16:54:22 -08:00
Carol Fager-Higgins
1afe76bc9f
new files for cs engine release notes. Split from DTR.
...
new prior RNs for cs engine
creating separate RNs for cs engine
getting all RN files to display meta data correctly
separated RNs and tweaked headers a bit
added aliases
fixed errors in CS Engine RNs metadata and removed aliases
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com >
2016-01-18 16:32:13 -08:00
Victor Vieux
3a5499040f
Merge pull request #1642 from dongluochen/tcpUserTimeout
...
Tcp user timeout
2016-01-18 16:29:12 -08:00
Riyaz Faizullabhoy
138d6cea09
Add, remove, and list delegation command. TUF changelist action change
...
for deletions (force vs. individual items)
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-01-18 16:24:45 -08:00
Aaron Lehmann
8c1a000799
Fix content type for schema1 signed manifests
...
The Payload function for schema1 currently returns a signed manifest,
but indicates the content type is that of a manifest that isn't signed.
Note that this breaks compatibility with Registry 2.3 alpha 1 and
Docker 1.10-rc1, because they use the incorrect content type.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-01-18 16:08:02 -08:00
Nathan LeClaire
a494033da9
Bump version to 0.6.0-rc2-dev
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-01-18 16:02:20 -08:00
Nathan LeClaire
85cb395c3d
Bump changelog for 0.6.0-rc1
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-01-18 15:58:08 -08:00