Evan Hazlett
45f08d9815
Merge pull request #880 from slashk/vb-cpu-tests
...
add integration tests for cpu count in virtualbox driver
2015-03-25 20:57:41 -07:00
Steve Francia
ff2fc9757d
Merge pull request #11781 from xamyzhao/patch-1
...
Updated step 5 with Windows instructions so that installation works in W...
2015-03-25 23:51:35 -04:00
Phil Estes
23699f5a29
Merge pull request #11468 from robertabbott/10959-refactor-progressreader-hack
...
Fixes hacks from progressreader refactor
2015-03-25 23:50:43 -04:00
Jake Champlin
c2fe262439
Add fixes for integration-cli tests w/ --net none
...
Adds network to integration tests that were failing without network.
Fixes #10964
Fixes #10968
Signed-off-by: Jake Champlin <jake.champlin.27@gmail.com >
2015-03-25 23:46:04 -04:00
Tom Kapanka
56626698fa
Fix 404s that manifest in GitHub but not in the Docs site. Links should work in both.
...
Spoke with Mary (Moxiegirl) about this issue and it occurs because
when Docs is built, it pulls files from various places. This causes
the GitHub view to have broken links (and images) which isn't ideal
since people may come to the docs via either approach.
Signed-off-by: Tom Kapanka <tom@kapanka.com >
2015-03-25 20:45:19 -07:00
paul
273fdd97ed
Fixes pointer error
...
Signed-off-by: Paul Mou <ppymou@gmail.com >
2015-03-25 20:45:17 -07:00
Ken Pepple
d80c47df88
add integration tests for cpu count (PR #879 ) in virtualbox driver
...
Signed-off-by: Ken Pepple <ken@solinea.com >
2015-03-25 20:40:50 -07:00
paul
c5bf2145f1
Fix vet warning
...
Signed-off-by: Paul Mou <ppymou@gmail.com >
2015-03-25 20:31:02 -07:00
Evan Hazlett
62388b0f50
Merge pull request #879 from pbiggar/819-add-virtualbox-cpu-count
...
Adds virtualbox-cpu-count - fixes #819
2015-03-25 20:23:48 -07:00
akoskaaa
f9ea5ecf40
[pep8] make test files and config files pep8 valid
...
Signed-off-by: akoskaaa <akos.hochrein@prezi.com >
2015-03-25 20:20:38 -07:00
Peggy Li
2a5a402c71
Update CmdCommit docstring and fix CmdHelp whitespace
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
2015-03-25 20:07:00 -07:00
Paul Biggar
dde614dbb0
Adds virtualbox-cpu-count - fixes #819
...
Signed-off-by: Paul Biggar <paul.biggar@gmail.com >
2015-03-25 20:06:22 -07:00
Liana Lo
4982374739
fix typos, grammar, more concise wording
...
Signed-off-by: Liana Lo <liana.lixia@gmail.com >
2015-03-25 20:03:42 -07:00
Nick Parker
1bc266dfa7
Changes response of postContainersWait to use a struct
...
Signed-off-by: Nick Parker <nikaios@gmail.com >
2015-03-25 21:01:14 -06:00
Peggy Li
a465e26bb0
Fix golint errors for casing in api/client package
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
2015-03-25 19:54:29 -07:00
Victor Vieux
c28b3a736c
Merge pull request #513 from technolo-g/Issue_501_check_create_args
...
Closes #501 : Error if unknown args are used in create
2015-03-25 20:51:25 -06:00
Nick Huanca, Matt Bajor, Matt Knox, Fed Sawyer, Joseph Benavidez, Tom Haschenburger and Wes Morgan
366d234626
Closes #501 : Error if unknown args are used in create
...
Signed-off-by: Matt Bajor <matt@notevenremotelydorky.com >
2015-03-26 02:39:33 +00:00
Victor Vieux
4fadc01ca9
Merge pull request #515 from titanous/patch-1
...
Remove Flynn from potential users in docs
2015-03-25 19:38:05 -06:00
bobby abbott
0cd6c05d81
Fixes hacks from progressreader refactor
...
related to #10959
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
2015-03-25 18:21:02 -07:00
moxiegirl
f84086be2a
Merge pull request #11776 from shin-/security_opt_docs_fix
...
API docs fix for SecurityOpt parameter.
2015-03-25 18:20:59 -07:00
Evan Hazlett
f524029d48
virtualbox: add maximum retry for allocating a tcp port
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-03-25 18:10:54 -07:00
Maxim Kulkin
b4d7b0f865
Explain advanced contribution workflow more
...
Explain why advanced contribution workflow have to be so complex
Signed-off-by: Maxim Kulkin <mkulkin@mirantis.com >
2015-03-25 18:04:41 -07:00
Evan Hazlett
5f573a81d4
Merge pull request #856 from slashk/env-hangs-on-stopped-machine
...
fixes #855 for docker-machine env on stopped machines
2015-03-25 17:59:22 -07:00
Jessie Frazelle
667452ec63
Merge pull request #11779 from blatyo/add_ulimit_test
...
Add test for successful Ulimit Parse.
2015-03-25 17:34:58 -07:00
Alexander Morozov
d0b2cfa1f1
Merge pull request #11778 from blatyo/fix_ulimit_string
...
Fix (*Ulimit).String() function. Closes #11769 .
2015-03-25 17:33:00 -07:00
xamyzhao
ba222f7bc8
Updated step 5 with Windows instructions so that installation works in Windows
...
Signed-off-by: Amy Zhao <x.amy.zhao@gmail.com >
Signed-off-by: Amy Zhao <xamyzhao@mit.edu >
2015-03-25 20:32:50 -04:00
Evan Hazlett
93ffb83723
Merge pull request #832 from slashk/no-active-host-ssh-bug
...
fixes issue #831 and issue #771 by checking for unset machine name
2015-03-25 17:29:52 -07:00
Evan Hazlett
4cc01ee8d6
Merge pull request #872 from nathanleclaire/test_migration
...
Test migration functions
2015-03-25 17:19:32 -07:00
Jonathan Rudenberg
a55f4fc36e
Remove Flynn from potential users in docs
...
Flynn doesn't use the Docker API.
2015-03-25 17:08:55 -07:00
Allen Madsen
a97ca674f0
Add test for successful Ulimit Parse.
...
Signed-off-by: Allen Madsen <blatyo@gmail.com >
2015-03-25 20:03:26 -04:00
Allen Madsen
cb168e5622
Fix (*Ulimit).String() function. Closes #11769 .
...
Signed-off-by: Allen Madsen <blatyo@gmail.com >
2015-03-25 19:39:05 -04:00
Victor Vieux
345d1cb86e
Merge pull request #478 from smothiki/softaffinity
...
Add support for Soft Affinity
2015-03-25 17:31:13 -06:00
Joffrey F
61dba98608
SecurityOpt parameter is singular, and belongs in HostConfig
...
since API 1.17
Signed-off-by: Joffrey F <joffrey@docker.com >
2015-03-25 16:25:13 -07:00
Arnaud Porterie
e589dc7424
Merge pull request #11757 from ankushagarwal/Fds
...
Rename 'Fds' to 'File Descriptors' in docker info
2015-03-25 16:24:57 -07:00
Jimmy Puckett
5dde99163e
running code formatter as @tiborvass requested
...
Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com >
2015-03-25 19:24:55 -04:00
Jessie Frazelle
89e7f5e661
Merge pull request #11772 from aneshas/11718-redundant-else
...
Fixed redundant else
2015-03-25 16:16:16 -07:00
Jessie Frazelle
f14bf9b53c
Merge pull request #11773 from icecrime/unused_securityopt_field
...
Remove unused runconfig.Config.SecurityOpt field
2015-03-25 16:15:41 -07:00
Jessie Frazelle
8cd3564ec1
Merge pull request #11771 from aneshas/11719-redundant-elses
...
Removed redundant elses
2015-03-25 16:06:30 -07:00
Tibor Vass
8d62e12f4d
Merge pull request #11745 from imdreamrunner/patch-1
...
Add missing newline for bash code example
2015-03-25 16:58:55 -06:00
Tibor Vass
136f8fa2ff
Merge pull request #11774 from thaJeztah/fix-workdir-typo
...
Fix typo "WRKDIR" -> "WORKDIR"
2015-03-25 16:55:57 -06:00
Tibor Vass
87e877e3c1
Merge pull request #11748 from minimum2scp/fix/debootstrap
...
removed unnecessary tabs from /usr/sbin/policy-rc.d, and /sbin/initctl for mkimage.sh debootstrap
2015-03-25 16:55:13 -06:00
Sebastiaan van Stijn
6fdb583f38
Fix typo "WRKDIR" -> "WORKDIR"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-03-25 23:47:38 +01:00
Arnaud Porterie
e39646d2e1
Remove unused runconfig.Config.SecurityOpt field
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-03-25 15:46:42 -07:00
Anes Hasicic
3d7b9e8f30
Fixed redundant else
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
2015-03-25 23:44:32 +01:00
Stephen Day
fd3373b91c
Merge pull request #302 from RichardScothern/richardscothern-298
...
Attempt to identify remote IP addresses for requests which come through proxies.
2015-03-25 15:43:34 -07:00
Alexander Morozov
e6cbffe94b
Merge pull request #11761 from runcom/11731-remove-engine-status
...
Remove engine.Status, replace with standard go error
2015-03-25 15:41:02 -07:00
Anes Hasicic
1b6065de8f
Removed redundant elses
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
2015-03-25 23:34:00 +01:00
Aanand Prasad
99f7eba930
Add Docker 1.6 RC2 to tested versions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-03-25 14:48:39 -07:00
Antonio Murdaca
c79b9bab54
Remove engine.Status and replace it with standard go error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-25 22:32:08 +01:00
Peggy Li
b5d0380108
Add godoc-style docstrings to Cmd... methods
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
2015-03-25 14:17:11 -07:00