Nathan LeClaire
a31808d07e
Remove newline
...
Infof adds it automatically.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-06 18:18:06 -08:00
Nathan LeClaire
b0f687b1b8
Merge pull request #2168 from dgageot/2167-b2d-upgrade
...
FIX #2167 b2d download timeout during upgrade
2015-11-06 18:16:52 -08:00
John Howard
ad5052df23
Tidy config/hostconfig structures
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-06 17:53:46 -08:00
Olivier Gambier
6a646aeedf
Merge pull request #2208 from amir/master
...
Use rackspace's specialized client
2015-11-06 17:51:29 -08:00
Nathan LeClaire
a020c3eac7
Delete bridge after powering daemon down
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-06 17:49:33 -08:00
Nathan LeClaire
ad757310fb
Fix boot2docker import regression
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-06 17:10:41 -08:00
Ted Reed
fddbf73a57
De-obfuscate error message
...
Previously, this error message would stringify as a pointer address,
which isn't particularly helpful.
This change breaks out the elements of the challenge object such that
the error is appropriately represented.
Signed-off-by: Ted Reed <ted.reed@gmail.com >
2015-11-06 17:10:28 -08:00
Alexander Morozov
ad55d29c91
Merge pull request #17575 from Microsoft/10662-nativetemplate
...
Windows: Fix native exec template
2015-11-06 16:14:44 -08:00
John Howard
d92f7f42b2
Windows: Native daemon build
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-06 15:35:56 -08:00
John Howard
ee6c3580c9
Move validation functions
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-06 15:28:50 -08:00
John Howard
33faea576f
Windows: Fix test-unit for local run
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-06 15:23:48 -08:00
David Calavera
1ba280a8db
Merge pull request #17576 from Microsoft/10662-graphtest
...
Windows: Fix daemon\graphdriver\graphtest
2015-11-06 15:13:31 -08:00
David Calavera
1228103563
Merge pull request #17511 from Microsoft/jjh/fix-test-paths
...
Fix test file paths
2015-11-06 15:09:03 -08:00
David Calavera
2fff6b15fe
Merge pull request #17777 from Microsoft/10662-tp4locahost
...
Windows [TP4] localhost mitigation for 2-second perf regression
2015-11-06 15:06:27 -08:00
David Calavera
f198334400
Merge pull request #17738 from Microsoft/jjh/login
...
Windows: [TP4] Fix docker login
2015-11-06 15:02:42 -08:00
David Calavera
754c2e08b7
Merge pull request #17751 from guilhem/patch-1
...
Fix missing `-d` flag in docker.fish
2015-11-06 14:59:30 -08:00
Lei Jitang
451b79d691
Test to verify --mac-address doesn't get applied to new endpoint
...
created on network connect.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
2015-11-06 14:52:35 -08:00
Vincent Demeester
2d87403704
Merge pull request #17767 from LK4D4/nice_logs_message
...
Return nice client-side message for docker logs
2015-11-06 23:51:05 +01:00
Aditi Rajagopal
1c9a5d7be7
Checkers on docker_cli_by_digest_test
...
Applying #16756 to integration-cli/docker_cli_by_digest_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
2015-11-06 16:15:35 -06:00
Christopher Jones
93939c3f9f
Fixed broken links in docker_remote_api
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
2015-11-06 16:12:51 -06:00
Santhosh Manohar
dedcf6a6ff
Allow port mapping only for endpoint created on docker run
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
2015-11-06 13:54:17 -08:00
John Howard
eb2acb8f0e
Windows [TP4] localhost mitigation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-06 13:52:59 -08:00
Vincent Demeester
7a82429b3d
Use checker for docker_cli_run_unix_test.go
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-11-06 22:49:16 +01:00
moxiegirl
8aa8d51610
Merge pull request #17713 from nathanleclaire/mhs_nits_2_the_sequel_electric_overloo
...
Revise commands in Compose section of multi-host quickstart
2015-11-06 13:04:43 -08:00
Tianon Gravi
1c383af6ae
Fix Windows support in .vendor-helpers.sh
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-11-06 12:07:24 -08:00
Alexander Morozov
e37e329074
Return nice client-side message for docker logs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-06 11:40:48 -08:00
French Ben
e4c5e99103
Merge pull request #1181 from FrenchBen/1175-pull-count
...
Added pull count to images - Fixes 1175
2015-11-06 11:34:09 -08:00
Tonis Tiigi
47da59f7ec
Fix symlink handling in builder ADD/COPY commands
...
Fixes #17290
Fixes following issues:
- Cache checksums turning off while walking a broken symlink.
- Cache checksums were taken from symlinks while targets were actually copied.
- Copying a symlink pointing to a file to a directory used the basename of the target as a destination basename, instead of basename of the symlink.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-11-06 10:58:12 -08:00
Amir Mohammad Saied
a6c44f5d4e
Use rackspace's specialized client
...
`openstack.NewDerivedDriver` sets client to `openstack.GenericClient`
therefore `rackspace.Client` is getting ignored.
`rackspace.Client.Authenticate` has different semantics than
`openstack.GenericClient.Authenticate`, thus almost all operations with
`rackspace` driver fail at the moment.
Signed-off-by: Amir Mohammad Saied <amirsaied@gmail.com >
2015-11-06 18:30:31 +00:00
Alexander Morozov
38e34cf6da
Use name instead of container in Commit
...
It will make daemon interface separation easier later.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-06 10:22:00 -08:00
Daniel Nephin
7c2a16234f
Recreate dependents when a dependency is created (not just when it's recreated).
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-11-06 12:29:52 -05:00
Jeffrey Morgan
fc14ce23f4
Bump to 1.9.0b
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-11-06 09:13:55 -08:00
Jeffrey Morgan
dd885a8d8a
Fix initial page positioning
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-11-06 09:11:38 -08:00
Alexander Morozov
cc207aa136
Merge pull request #17185 from cpuguy83/use_finer_locking_for_volume_store
...
Fix potential races in the volume store
2015-11-06 08:48:12 -08:00
Vivek Goyal
2c8b7c597a
devmapper: Provide more error information if blkid fails
...
Right now if blkid fails we are just logging a debug message and don;t return
the actual error to caller. Caller gets the error message that thin pool
base device UUID verification failed and it might give impression that thin
pool changed. But that's not the case. Thin pool is in such a state that we
could not even query the thin device UUID. Retrun error message appropriately
to make situation more clear.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-11-06 08:21:20 -05:00
Doug Davis
6ba7d04d16
Merge pull request #17753 from runcom/fix-typo-tests-reqs
...
integration-cli: requirements: fix typo
2015-11-06 07:02:51 -05:00
Antonio Murdaca
7dda44004d
Merge pull request #17746 from coolljt0725/remove_lxcconfig
...
Remove LxcConf in daemon_test.go and fix a typo
2015-11-06 12:21:33 +01:00
Antonio Murdaca
313b85fa47
integration-cli: requirements: fix typo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2015-11-06 12:15:42 +01:00
Guilhem Lettron
4a3cd88172
Fix missing -d flag in docker.fish
...
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr >
2015-11-06 11:53:17 +01:00
Petri Sirkkala
4c345be02a
Fail fast in case we are run without terminal
2015-11-06 09:44:21 +02:00
Olivier Gambier
9775f9ec04
Merge pull request #2202 from kunalkushwaha/master
...
BugFix: IP in template need as per Structure
2015-11-05 23:05:13 -08:00
David Gageot
4ac76457f9
Merge pull request #2199 from nathanleclaire/none_running
...
Change default state of none driver to state.Running
2015-11-06 07:59:49 +01:00
Kunal Kushwaha
055de5f276
BugFix: IP in template need as per Struct
...
Lint changes in SwarmCommandOptions chnaged `Ip` to `IP`.
It required change in template code also.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp >
2015-11-06 15:47:15 +09:00
Gou Rao
1a8cd193f9
Update plugins.md
...
Signed-off-by: Gou Rao <gou@portworx.com >
2015-11-05 21:16:26 -08:00
Brian Goff
f1834153de
Merge pull request #17383 from Microsoft/10662-volumeerrors
...
Fix volume error messages
2015-11-05 21:58:03 -05:00
Nathan LeClaire
ac6a18ba25
Change none default state to Running
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-05 18:37:15 -08:00
Lei Jitang
00d00b429f
Remove LxcConf in daemon_test.go and fix a typo
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-11-06 09:58:06 +08:00
Sebastiaan van Stijn
5e2f31e992
Merge pull request #17696 from thaJeztah/update-ubuntu-install
...
Docs: add "Linux kernel extra" to manual install
2015-11-06 02:04:05 +01:00
Jeffrey Morgan
d5dca184b5
Fix metrics bugs on Windows
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-11-05 16:55:45 -08:00
moxiegirl
5d92da1805
Merge pull request #23 from vdemeester/commit-sign
...
Added additional guidance for signing off git commits when contributing.
2015-11-05 16:23:59 -08:00