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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
950464de97
Merge pull request #11395 from mitchcapper/master
...
Change windows default permissions to 755 not 711, read access for all p...
Upstream-commit: 56acb1aac87c489674b708d0d2b2128fa7944f66
Component: engine
2015-03-23 09:59:40 -07:00
53a187728a
Merge pull request #11574 from icecrime/release_version_push
...
Document VERSION file update scheme
Upstream-commit: bf304cc414c98830a4d98cb6b7f253e9397b9813
Component: engine
2015-03-23 09:47:16 -07:00
31ae66ceae
Test image api through local V1 repo
...
Closes #10967
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 5daa9260bcef2a47c493adc04e6638c9d200a9cf
Component: engine
2015-03-23 16:45:48 +00:00
a1d0fa6752
Fix hanging up problem when start and attach multiple containers
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: 7dc1af146d24c346ac74c9dcb1df98f9ef51339d
Component: engine
2015-03-23 12:10:22 +08:00
9dcfa784ef
Merge pull request #11538 from duglin/EmptyVolume
...
Check volume path to make sure its not the empty string
Upstream-commit: ded0ada9b47ab48b57d14225ec663e3756faff7f
Component: engine
2015-03-22 19:25:50 -07:00
088f0e2cb3
Merge pull request #9774 from pwaller/cancellation
...
Add basic build cancellation
Upstream-commit: 45ee402a631a59e2a33df7b2f63a49f6f3f84f09
Component: engine
2015-03-22 19:16:23 -07:00
d411e326ae
Merge pull request #11505 from lloydde/doc-ref-run-it
...
doc: reference/run introduce -it .
Upstream-commit: 0b63b343e8cb83d21c9de5d986b0a4ae01fb4646
Component: engine
2015-03-22 19:14:34 -07:00
0485dd2e93
Merge pull request #11550 from moxiegirl/adjust-mac-install
...
Clarifying structure in light of Kitematic
Upstream-commit: 0926a023d65ae7d5cb528d205a4e1fe32b47c3e4
Component: engine
2015-03-22 19:13:38 -07:00
e24a7c417e
Merge pull request #11062 from misterbisson/joyentinstall
...
Installation on Joyent
Upstream-commit: 19295cb37b56648008c2d26bc86e9589a643d1a4
Component: engine
2015-03-23 12:07:49 +10:00
4b3632f9e6
Merge pull request #11532 from dmcgowan/fix-v1-404-issue-11510
...
Add check for 404 on get repository data
Upstream-commit: 126539540607887b6f1bec4559dfa60c0ae562e5
Component: engine
2015-03-22 18:57:35 -07:00
c6792796c3
Document VERSION file update scheme
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: f07ac12791e4af7f199a893705204481588062ae
Component: engine
2015-03-22 18:45:01 -07:00
bac420baa9
Merge pull request #11566 from tiborvass/carry-10864
...
Carry 10864: ANSI terminal emulation for windows
Upstream-commit: e09ead98ef41d14d7e3d8784a0edf29d4afd60f5
Component: engine
2015-03-22 18:21:32 -07:00
7cd85af5c7
Merge branch 'master' of github.com:docker/docker into joyentinstall
...
Reolved conflict in:
docs/mkdocs.yml
Signed-off-by: Casey Bisson <casey.bisson@joyent.com >
Upstream-commit: a71d89d041d7853698c84ccf233f477383a9dcb3
Component: engine
2015-03-22 18:19:27 -07:00
4b295342e5
Add check for 404 on get repository data
...
No longer add the body to the error when a 404 is received on get repository data.
closes #11510
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: c8d2ec93caf7c64f3e510e4e75f49614880ed9b9
Component: engine
2015-03-22 18:15:18 -07:00
5ba6e61a95
Merge pull request #11553 from Sirupsen/update-logrus-71
...
vendor: update logrus to 0.7.1
Upstream-commit: 01506d13fac29b2b340150c4cf01b1e14430f405
Component: engine
2015-03-22 18:11:17 -07:00
7d0f834cb3
Merge pull request #10903 from programmerq/docs_submodules
...
Update docs around private github submodules in automated builds.
Upstream-commit: cce196d64b50384a71a0fbf1f1026e8580ff9d15
Component: engine
2015-03-23 11:01:28 +10:00
67fed9c55e
Restore TestPullVerified test
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 33448ac3c9c0c63fb07f7bf04cec998d3536fc10
Component: engine
2015-03-22 17:56:05 -07:00
addc7158f4
Merge pull request #11572 from tiborvass/skip-hello-world-test
...
Skip TestPullVerified because hello-world image cannot be verified
Upstream-commit: 48a954f4b3af4602a2efcbc3e5ba963ce25091d6
Component: engine
2015-03-22 20:09:55 -04:00
2b2e612495
Merge pull request #11400 from ahmetalpbalkan/docs/azure
...
docs: Add Microsoft Azure installation instructions
Upstream-commit: cf7d093e17d89371cf375a5f66e8103d7dde6e3c
Component: engine
2015-03-23 10:03:00 +10:00
503af64bfc
Skip TestPullVerified because hello-world image cannot be verified
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: df389df9904dc1585160d7992c6f3dc150490e05
Component: engine
2015-03-22 19:34:40 -04:00
5b307a9ba4
winconsole: cleanup
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 01a43174dae3b88e264f3139e1a4bf7ee666957f
Component: engine
2015-03-22 15:47:54 -04:00
112ea1d359
Merge pull request #11222 from moxiegirl/update-howto-docs
...
Updating in light of new contributors guide. Got verbal ok from Jess to pull janky is acting janky.
Upstream-commit: 4abc0fcf595d6355866f1c074feb5d96ac734861
Component: engine
2015-03-22 12:21:12 -07:00
e1ebdbecb2
Updating in light of new contributors guide
...
Link to new guide. Added a quickstart contributor guide for experienced people.
Converting narrative style to procedures for easier use. I think there is something missing in the
release publishing section...but it looks like it was missing in the original.
Updates per thaJeztah
Edits per Fred
Updating with comments from Sven
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: fdbec264111ac20b06cdd9b885fe47415a6495e4
Component: engine
2015-03-22 11:55:32 -07:00
6bc6946799
Merge pull request #11567 from draghuram/contrib-docs
...
Fix typo in git setup doc.
Upstream-commit: b485d3dfa72b5574d9f0dc6346e504cc18a0e6ba
Component: engine
2015-03-22 11:31:00 -04:00
