Lei Jitang
aca7c0f94e
Add some run option to bash completion
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 7d707360159852dde4e75fc5d4778c72abc44a03
Component: engine
2015-03-24 20:15:16 +08:00
moxiegirl
77de545445
Merge pull request #11692 from khoomeister/ck-fix-another-typo
...
fix test-and-docs typo "do" to "due"
Upstream-commit: 617f18b0011b45a9ef71d4adb45b3ca45132e1e6
Component: engine
2015-03-23 21:36:40 -07:00
Chris Khoo
6fc2c6927a
fix test-and-docs typo "do" to "due"
...
Signed-off-by: Chris Khoo <chris.khoo@gmail.com >
Upstream-commit: df98ce0a28c6d38757305dccc1acb4b8989e6aff
Component: engine
2015-03-23 21:12:09 -07:00
Sven Dowideit
05ea1bc108
Merge pull request #11684 from khoomeister/ck-fix-prereq-typo
...
fix broken prerequisite link
Upstream-commit: 72394a5d7a50f0132262685008ed4f924dcc3016
Component: engine
2015-03-24 13:45:48 +10:00
Arnaud Porterie
0d40b13936
Merge pull request #11681 from alena1108/master
...
Removed unused "mutex" field
Upstream-commit: 3ebd7684870aa7144963ae3ed17c766c6192de44
Component: engine
2015-03-23 19:40:38 -07:00
Chris Khoo
5367fab1f0
fix broken prerequisite link
...
Signed-off-by: Chris Khoo <chris.khoo@gmail.com >
Upstream-commit: b21751da907cb2889aa9ca95ebf6c4c66e6131a6
Component: engine
2015-03-23 19:22:17 -07:00
Alena Prokharchyk
68100310d8
Removed unused "mutex" field
...
fixes #11659
Signed-off-by: Alena Prokharchyk <alena@rancher.com >
Upstream-commit: dabd8a02aeff8b2122efa0b55de4ba52c429f936
Component: engine
2015-03-23 19:05:21 -07:00
Jessie Frazelle
bb8cd4ea0b
Merge pull request #11665 from runcom/11613-api-exec-start-structured-response
...
Return ContainerExecCreateResponse from container exec create API endpoint
Upstream-commit: e6b7d9307269973d3dc8ff53cff4e141c47c671e
Component: engine
2015-03-23 17:52:15 -07:00
Michael Crosby
8ed1ac3b2b
Merge pull request #11634 from robertabbott/testutils_refactor
...
Refactors pkg/testutils
Upstream-commit: f586145cf178b9290034a6bbd1964e110a25377e
Component: engine
2015-03-23 17:30:51 -07:00
Jessie Frazelle
e28e5584fa
Merge pull request #11674 from jamshid/docfix
...
correcting git fetch command
Upstream-commit: 26f84d50aa89bc34751a84136e733e48e8b8f703
Component: engine
2015-03-23 17:11:31 -07:00
Jamshid Afshar
5715097ddd
correcting git fetch command
...
Signed-off-by: Jamshid Afshar <jafshar@yahoo.com >
Upstream-commit: 841692ff864c0d71347607eb8e4fbcf826d859c0
Component: engine
2015-03-23 19:00:05 -05:00
Jessie Frazelle
7074731d32
Merge pull request #11636 from robertabbott/refactor_networkfs
...
Refactor pkg/networkfs
Upstream-commit: d5eea4e8b04074b709d1bbe19b5336504df44446
Component: engine
2015-03-23 16:58:29 -07:00
Jessie Frazelle
c0463e32c4
Merge pull request #11672 from nparker94/master
...
Added missing code example in the RM command reference
Upstream-commit: f99da5745c6006f1171ca7f7665327fd4fcd0e1c
Component: engine
2015-03-23 16:53:39 -07:00
Michael Crosby
19aa69e7d8
Merge pull request #11667 from icecrime/integration-cli_image_cleanup
...
Cleanup "hello-world" image in build tests
Upstream-commit: 4e3c72a026f356508c3f530a15aa2dc09bcb27c9
Component: engine
2015-03-23 16:42:46 -07:00
Antonio Murdaca
a82b5988e8
Return ContainerExecCreateResponse from container exec start API endpoint, Fixes #11613
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 0c3d2f6f9658ae9b1e7c7cc6f7fda730d4b04898
Component: engine
2015-03-24 00:41:54 +01:00
Tibor Vass
925b84807a
Merge pull request #11657 from GeorgeMac/cleanup-redundant-else
...
#11602 - Cleanup redundant else statements find via golint
Upstream-commit: 92f9e2d3955fcc3341407809c9db33ac702e1508
Component: engine
2015-03-23 18:27:29 -05:00
Michael Crosby
71c4ad5a8f
Merge pull request #11666 from dmcgowan/fix-v2-get-all-tags
...
Fix v2 get all tags (carrying 11334)
Upstream-commit: f7af5b0a84bc1a6e18839e5217afe085e078f6a0
Component: engine
2015-03-23 16:21:58 -07:00
Michael Crosby
8eb4f18f1a
Merge pull request #11671 from noxiouz/11669-syslog-log-remove-redundant-stringcast
...
Syslog.Log - Remove redundant cast of msg.Line []byte to string
Upstream-commit: 839350d37783bb80e58e96272905bb49b64717fc
Component: engine
2015-03-23 16:16:18 -07:00
Natalie Parker
05267b46bc
Added missing code example in the RM command reference of command to delete all stopped containers
...
Signed-off-by: Natalie Parker <nparker@omnifone.com >
Upstream-commit: fe1f5ac77cda335ee773956cc8683a0c31791c3c
Component: engine
2015-03-23 23:05:57 +00:00
Alexander Morozov
d10460e7af
Merge pull request #11570 from runcom/9658-consistent-autoremove
...
Remove container if --rm flag is passed and container cannot be started
Upstream-commit: 197a3f0a98bbedc1253df3fae42837769871beb1
Component: engine
2015-03-23 15:38:51 -07:00
Anton Tiurin
59aa846db8
Syslog.Log - Remove redundant cast of msg.Line []byte to string as
...
it's a fmt.Sprintf responsibility.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
Upstream-commit: f2c7b4d7437443d469b2247362835af02ccef385
Component: engine
2015-03-24 01:35:54 +03:00
Jessie Frazelle
f673778d3a
Merge pull request #11469 from albers/completion-cp
...
restrict bash completion for hostdir arg to directories
Upstream-commit: bcb369af11dc09b7c5787cffe3a5d82dee18cc19
Component: engine
2015-03-23 15:31:00 -07:00
Jessie Frazelle
c1aef62402
Merge pull request #11422 from vbatts/vbatts-overlay_dir_mtime_changes
...
pkg/archive: ignore mtime changes on directories
Upstream-commit: 9d00d8137f9b6075284a89bb832c4a828e19a9fb
Component: engine
2015-03-23 15:24:05 -07:00
Arnaud Porterie
293d14edd7
Merge pull request #11264 from brahmaroutu/fixtest_10967
...
Test image api through local V1 repo, skip network test.
Upstream-commit: 3b4ff1c132669017f04d3b2e67517ff0c9a1a3df
Component: engine
2015-03-23 15:20:39 -07:00
Arnaud Porterie
b27a399633
Cleanup "hello-world" image in build tests
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: bfc748221b15a0f6e42a6ab520ed6e31fa9e90c8
Component: engine
2015-03-23 15:16:13 -07:00
Alexander Morozov
63afa406b2
Merge pull request #11664 from crosbymichael/update-libct-mar23
...
Update libcontainer to fd0087d3acdc4c5865de1829d4accee5e3ebb658
Upstream-commit: dccaf1434f9359e33f94053719c66150eef83d22
Component: engine
2015-03-23 15:00:34 -07:00
Derek McGowan
bca1423917
Add struct tags on v2 remote tags struct
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 4925d98d1f638e9439e19b6c89c608a64a281a39
Component: engine
2015-03-23 14:33:52 -07:00
Meaglith Ma
503249b833
Fix decode tags value error when call get /v2/<name>/tags/list in registry api v2.
...
Signed-off-by: Meaglith Ma <genedna@gmail.com >
Upstream-commit: 221e9624e3a7a7a9b81ffda9930657352080e32d
Component: engine
2015-03-23 14:33:52 -07:00
Alexander Morozov
9e396b31ce
Merge pull request #11658 from 4gh/doc_package_builder
...
Add builder/evaluator comments for the package in godoc-style
Upstream-commit: 9f894c93e40cda8177febe71cd3c17d4b7613659
Component: engine
2015-03-23 14:27:23 -07:00
Jessie Frazelle
6be1b45eff
Merge pull request #11545 from cpuguy83/remove_allocator_warning
...
Don't warn when ip_local_port_range not found
Upstream-commit: ccd4181d10752c41603fcc03bb6b576603b24271
Component: engine
2015-03-23 14:19:57 -07:00
Michael Crosby
fa9aab1c43
Update libcontainer to fd0087d3acdc4c5865de1829d4a
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: e321ec980708b052fd788b41af97f875630cda9c
Component: engine
2015-03-23 14:14:20 -07:00
Alexander Morozov
b2d8692608
Merge pull request #11660 from paulbellamy/11626-portallocator
...
Refactoring portallocator away from a global var
Upstream-commit: d852e5fde89ecd5eec53983be3c62e371147ad8c
Component: engine
2015-03-23 14:10:56 -07:00
Frank Herrmann
835a16cc1d
Add builder/evaluator comments for the package in godoc-style
...
fixes #11617
Signed-off-by: Frank Herrmann <fgh@4gh.tv >
Upstream-commit: a0cd0045282f21215d7845a987ec6292aa92a685
Component: engine
2015-03-23 20:56:03 +00:00
Paul Bellamy
4df1193b38
Refactor global portallocator state into a global struct
...
Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com >
Upstream-commit: 12576798769081823a3f660b46290da808630616
Component: engine
2015-03-23 20:41:41 +00:00
George MacRorie
0221549820
Cleanup redundant else statements find via golint #11602
...
Signed-off-by: George MacRorie <gmacr31@gmail.com >
Upstream-commit: 664ef0cbe2113e8307135e656cc6db9199f8268e
Component: engine
2015-03-23 20:40:29 +00:00
Brian Goff
f2b00f6fe1
Improve err message when parsing kernel port range
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 8e4d9f3cf9669f45b0591eea27c47b6f64d89c2d
Component: engine
2015-03-23 13:29:25 -07:00
Alexander Morozov
59d8188314
Merge pull request #11656 from runcom/11611-builder-evaluator-remove-hardcoded-error
...
Remove hardcoded error from builder/evaluator.go
Upstream-commit: bc73f0ea4cb5cacfd973efc9791d5d329c8542f1
Component: engine
2015-03-23 13:25:08 -07:00
Antonio Murdaca
9b9105b3b2
Remove hardcoded error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 8b02d85e1728b48729b2fb8553b2ec4b56a30d37
Component: engine
2015-03-23 20:58:16 +01:00
Jessie Frazelle
7e56dcc56b
Merge pull request #11648 from ahmetalpbalkan/win-cli/ansi-emulation-check
...
Disable ANSI emulation in certain windows shells
Upstream-commit: b0946775595692efa5a9ca92a2b27cf2b617e28a
Component: engine
2015-03-23 12:55:31 -07:00
Alexander Morozov
974bfa30e6
Merge pull request #11654 from runcom/11650-syslog-close-redunant-nil-check
...
syslog Close() - Remove redunant nil check, s.writer cannot be nil
Upstream-commit: 2717302cc69c865cfec02fb48b3cb173d6980364
Component: engine
2015-03-23 12:32:26 -07:00
Alexander Morozov
f3e52eec93
Merge pull request #11653 from runcom/11649-syslog-refactor-log-else-clause
...
Refactor syslog Log else clause
Upstream-commit: ec27b77dc2b3d8560a0d224f84c96d63648a3746
Component: engine
2015-03-23 12:29:35 -07:00
Antonio Murdaca
84d2a9e3ec
Remove redunant nil check, s.writer cannot be nil
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e600df2d9732b8c40d056563e361ded6cd5ce773
Component: engine
2015-03-23 20:03:24 +01:00
Antonio Murdaca
1ef60888a8
Refactor syslog Log else clause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 8f025aae36fd040d8d2617890b258b5460ae44db
Component: engine
2015-03-23 20:01:01 +01:00
Ahmet Alp Balkan
30a3ccd5cd
Disable ANSI emulation in certain windows shells
...
This disables recently added ANSI emulation feature in certain Windows
shells (like ConEmu) where ANSI output is emulated by default with builtin
functionality in the shell.
MSYS (mingw) runs in cmd.exe window and it doesn't support emulation.
Cygwin doesn't even pass terminal handles to docker.exe as far as I can
tell, stdin/stdout/stderr handles are behaving like non-TTY. Therefore not
even including that in the check.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: b38ff8c83d82b7958c62c07a8b82e4b85f0311c0
Component: engine
2015-03-23 18:38:43 +00:00
Alexander Morozov
dad3640059
Merge pull request #11458 from ibuildthecloud/syslog
...
Add syslog logging driver
Upstream-commit: 65e21f570358f46f6ad0f8fa2cd3394706ba169d
Component: engine
2015-03-23 11:34:33 -07:00
Tibor Vass
69bd180001
Merge pull request #10431 from duglin/Issue10391
...
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
Upstream-commit: 61966d281bb715a2359b27bcd30d0d59c98d2812
Component: engine
2015-03-23 13:30:11 -05:00
Jessie Frazelle
7dfdb9ea11
Merge pull request #11573 from icecrime/11572-restore_pull_test
...
Restore TestPullVerified test
Upstream-commit: 85ab3c3b49f902a3e0837e52ab3ce8fdfa2c8e5b
Component: engine
2015-03-23 11:21:16 -07:00
Jessie Frazelle
2ae5f5eb68
Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind
...
Allow path from normal volume existing to overwrite in start Binds
Upstream-commit: 1fe55b2f8bc966c0784527b30f507cbc90325df7
Component: engine
2015-03-23 10:43:02 -07:00
Alexander Morozov
2ed910fd38
Merge pull request #11406 from MabinGo/CmdStart_fix
...
Fix hanging up problem when start and attach multiple containers at once
Upstream-commit: bd952021613b26b7d8b8d078adda72d9ff6def00
Component: engine
2015-03-23 10:17:50 -07:00
Jessie Frazelle
8814588380
Merge pull request #10347 from unclejack/bufreader_reset
...
reset bufReader to avoid extreme growth of buffers
Upstream-commit: c4603de56a635086772364af52a62548ad15c2fc
Component: engine
2015-03-23 10:07:43 -07:00
