d8bff85dcd
Merge pull request #11281 from coolljt0725/fix_ipc_from_non_exist_container
...
Fix error from daemon no such image even when the image exist
Upstream-commit: 61069d8b69a62a3325a54833dfde70d4f30d2e1c
Component: engine
2015-03-28 06:58:48 -04:00
0544f5e034
Fix error from daemon no such image even when the image exist
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 013fb87543a47524efba3c371a1d22afe151287c
Component: engine
2015-03-28 09:07:20 +08:00
61cdd342d5
Merge pull request #11805 from runcom/11804-remove-err-field-job-struct
...
Remove err field from Job struct
Upstream-commit: 789a67e931d7ae251c88ce57ba2d9a8c6ff2f18d
Component: engine
2015-03-27 16:27:04 -07:00
0fa020686b
Merge pull request #11708 from coolljt0725/add_cgroup_parent_to_bash_completion
...
Add new docker run option to bash completion
Upstream-commit: e3b0014987664f8d675af2f72987c16e5733df48
Component: engine
2015-03-27 15:06:10 -07:00
0c7e99e9f0
Merge pull request #11852 from clnperez/doc-dev-container
...
Fix typo in doc at /set-up-dev-env
Upstream-commit: 221ff368df540bc2af259ad64455af8ac3394311
Component: engine
2015-03-27 15:03:36 -07:00
a44788dbfa
Merge pull request #11845 from lobatt/master
...
Issue #11836
Upstream-commit: c0884860931273ef26bc26fb7d97081b3ae2aaef
Component: engine
2015-03-27 14:55:04 -07:00
cbbbdaca2d
Merge pull request #11853 from EricR/doc-PkgSysInfo
...
Add some basic doc for SysInfo
Upstream-commit: 7cc73607a274c8795a88bf711a8d8d2cdd154bab
Component: engine
2015-03-27 14:52:20 -07:00
35d3543e9d
Merge pull request #11871 from NinjaTrappeur/dry-run-test
...
Fix vet warning in devicemapper.
Upstream-commit: cc609c75560f39bfa2a34d2ea0e4be292d851954
Component: engine
2015-03-27 14:48:55 -07:00
3495bd3522
Merge pull request #11848 from duglin/CleanupIntTests
...
Clean up integration-cli tests
Upstream-commit: 240f3e14c78f34102672b121a43b612989856d0d
Component: engine
2015-03-27 14:11:56 -07:00
f19170b3d5
Merge pull request #11872 from ankushagarwal/11825
...
Replace fmt.Fprint* with io.WriteString
Upstream-commit: 37241db5f3e83d4a39a220c0eb2013a696d455f2
Component: engine
2015-03-27 14:05:15 -07:00
98bfac2331
Merge pull request #11842 from brahmaroutu/events_tests
...
Events tests
Upstream-commit: 8c58bdd3a7d5aff31c446dfd6044c6e0d8afa7fb
Component: engine
2015-03-27 13:45:11 -07:00
7cb8e54ded
Replace fmt.Fprint* with io.WriteString
...
This fixes vet warnings in api/client/stats.go
Fixes #11825
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 6d21b2ba80e274e49d67e8f3d88bf9b3df567ff5
Component: engine
2015-03-27 13:08:20 -07:00
7ec8e95afe
Fix vet warning in devicemapper.
...
Issue #11828
Signed-off-by: Félix Baylac-Jacqué <baylac.felix@gmail.com >
Upstream-commit: 6b764bba8ad1c1006dadf24ec55edb9de200c706
Component: engine
2015-03-27 20:16:25 +01:00
10a440fbc6
Remove err field from Job struct, fixes #11804
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 60085e22ff9981bf26711295d12ea64ee29d85ea
Component: engine
2015-03-27 19:08:53 +01:00
e9805495bf
Update inline doc for New
...
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com >
Upstream-commit: 3716df57c097803dec220ff95fffdae8394145fc
Component: engine
2015-03-27 13:55:22 -04:00
daae801e4a
Merge pull request #11850 from kytrinyx/11796-git-mental-model
...
Clarify git instructions in project guide. Fixes #11796
Upstream-commit: 121de9e4e3e781a9f43edb1b062beef9f9a9d6db
Component: engine
2015-03-27 09:02:03 -07:00
1c9316a817
Merge pull request #11788 from reikani/pchoi
...
Changed snake case naming to camelCase.
Upstream-commit: da5c863d20df8c030b3ffc6c4e95f976ed162721
Component: engine
2015-03-26 23:55:50 -07:00
cce1904e9d
Add missing . in comment
...
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com >
Upstream-commit: 6abe160eaec49c693b69d14304fe39d78ea4abb4
Component: engine
2015-03-26 23:22:05 -04:00
b0def5e5a0
Add some basic doc for SysInfo
...
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com >
Upstream-commit: 01bbc3fbb9c3ab3dec0f271710739465b0f80b7a
Component: engine
2015-03-26 23:05:07 -04:00
4f989f959c
Use common code to test all events, when using filter that expect all lifecycle events.
...
Addresses: #10654
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: f5ad895ba624b6baddfa0c54a2da439b41b0535f
Component: engine
2015-03-27 02:47:46 +00:00
f047f87e51
Fix typo in doc at /set-up-dev-env
...
Save a whale!
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: dd6f988b23b56ce0ca17ab892143db53f1fa2f84
Component: engine
2015-03-26 21:46:35 -05:00
eb6bec8a3c
Clarify git instructions in project guide. Fixes #11796
...
The git model uses `upstream master` to refer to the branch on
the remote repository, and `upstream/master` to refer to the
local cache of the upstream branch.
I did not explain the difference in the docs (that seemed a bit
excessive), but I did clarify the instructions so that it refers
to the correct concept in each place.
Signed-off-by: Katrina Owen <katrina.owen@gmail.com >
Upstream-commit: 54c9ae187f5a3544881650c09e923d67ed229771
Component: engine
2015-03-26 19:24:14 -07:00
c6343683c9
Merge pull request #11846 from voltaic/master
...
Update set-up-dev-env.md
Upstream-commit: d2df901be3c5c964900de41286ba0c67aebfb5d1
Component: engine
2015-03-26 18:09:28 -07:00
34262a08d7
Merge pull request #11793 from lolilo/update-project-doc
...
fix typos, grammar, more concise wording
Upstream-commit: cd8ea1d17eff2424df6a63ef8de314e5724fd37a
Component: engine
2015-03-26 17:57:45 -07:00
5897cb3c81
Clean up integration-cli tests
...
My AR couldn't take it any more:
- one logDone per test
- PASSED lines don't wrap
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 9a9d23dbc40c9b650bd1f9f98a421b7ff2312f36
Component: engine
2015-03-26 17:25:50 -07:00
29d7b5b844
Merge pull request #11841 from runcom/11762-replace-aliased-logrus-imports
...
Replace aliased imports of logrus
Upstream-commit: 756b8f2fde210da5529e0a5480e149917ab25524
Component: engine
2015-03-26 16:49:01 -07:00
99064ea4ea
Update set-up-dev-env.md
...
Signed-off-by: graycoder <patgray1127@gmail.com >
Upstream-commit: ddcb3ad061db518aa076422ed6d81a2247fb3a8e
Component: engine
2015-03-26 19:41:31 -04:00
ca8fb68336
Merge pull request #11813 from miminar/show-verified-status
...
Consider tag updated also in case repo does not exist
Upstream-commit: be5fd157d597b566f33de1bda19750313132239c
Component: engine
2015-03-26 16:29:13 -07:00
794638affe
Merge pull request #11840 from ahmetalpbalkan/win-cli/term-resize-fix
...
term/winconsole: Identify tty correctly, fix resize problem
Upstream-commit: cf7104a0e853c453f08d052cb222b7071d4c27a2
Component: engine
2015-03-26 16:19:27 -07:00
8de06741d7
Issue #11836
...
Signed-off-by: chli <chli@freewheel.tv >
Upstream-commit: f581f742095e4b01b73e391546ee11323f8b5fd7
Component: engine
2015-03-26 19:18:23 -04:00
44f1acd948
Merge pull request #11832 from jamiehannaford/patch-1
...
Fix spelling
Upstream-commit: 8c1118a8f92400d8e3847b9aa5fc12b25fd17def
Component: engine
2015-03-26 15:47:27 -07:00
1b99faf246
Merge pull request #11801 from hqhq/hq_fix_doc_for_exec
...
update docs for container exec
Upstream-commit: 296642035df602a788c042ae09573f65cd29b200
Component: engine
2015-03-26 15:31:16 -07:00
e5b36a723c
Replace aliased imports of logrus, fixes #11762
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6f4d847046cb4e072de61d042c0266190d73a8c9
Component: engine
2015-03-26 23:22:04 +01:00
3dc8400325
term/winconsole: Identify tty correctly, fix resize problem
...
This change fixes a bug where stdout/stderr handles are not identified
correctly.
Previously we used to set the window size to fixed size to fit the default
tty size on the host (80x24). Now the attach/exec commands can correctly
get the terminal size from windows.
We still do not `monitorTtySize()` correctly on windows and update the tty
size on the host-side, in order to fix that we'll provide a
platform-specific `monitorTtySize` implementation in the future.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 0532dcf3dc1fa34fab5a9cdee6c4d87af66a6cdf
Component: engine
2015-03-26 15:11:28 -07:00
0913f2905d
Changed snake case naming to camelCase
...
Signed-off-by: Peter Choi <phkchoi89@gmail.com >
Upstream-commit: ae907e7af16136225417242ef5d55d3f6062fb3b
Component: engine
2015-03-26 15:05:45 -06:00
90483774e2
Merge pull request #11834 from jamiehannaford/contributor-guide-fix
...
Make gofmt use the filename previously referenced
Upstream-commit: 42f9594fd3b56fedfca5ceb38d7be568ff05a986
Component: engine
2015-03-26 12:41:53 -07:00
21101c3fb4
Make gofmt use the filename previously referenced
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
Upstream-commit: 7fdf5257b4d4c94196303cba52b1882001d32754
Component: engine
2015-03-26 20:39:15 +01:00
0c72a7c4d1
Merge pull request #10050 from lindenlab/9922-private-registry-search-401
...
9922-fix: private registry search with auth returns 401
Upstream-commit: df90fb716bba00712563cc4816389c631e47ee78
Component: engine
2015-03-26 12:24:06 -07:00
e68fde69b6
Fix spelling
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
Upstream-commit: 849e55f4e499f729e7e63ca2b20f3371a8e15d86
Component: engine
2015-03-26 20:24:01 +01:00
b58f7899ec
Merge pull request #11747 from moxiegirl/11694-remove-sudo-added-in-error
...
Proposal: Removing sudo from examples
Upstream-commit: dcc6e818febf8d3df2980dc474bc07c470f63e38
Component: engine
2015-03-26 15:18:48 -04:00
04f472f007
Fix for issue 9922: private registry search with auth returns 401
...
Signed-off-by: Don Kjer <don.kjer@gmail.com >
Upstream-commit: 6b2eeaf8965bac07022752c411b1f8a0f35f9571
Component: engine
2015-03-26 18:59:16 +00:00
e5276fe0a7
Removing sudo from command line examples
...
We now advise people to configure docker group and
add to sudo. Mac shouldn't use sudo. Removed sudo
from command examples. Left in installation to be removed
in installation doc sweep -- removing requires finer
grain control.
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 29d01b7ddedb5d1b5ec2262e2d961b737cbc6f38
Component: engine
2015-03-26 11:12:37 -07:00
d7de64918b
Merge pull request #11734 from yestin/11601-test-chrootarchive
...
Add more tests for pkg/chrootarchive
Upstream-commit: 6a43d71014788c88df647111330f75972aed9924
Component: engine
2015-03-26 11:03:58 -07:00
4d63ee40bb
Merge pull request #11766 from peggyl/11596-api-commands-godoc
...
Add godoc-style docstrings to Cmd... methods
Upstream-commit: 708ed9d87a5938e03abc019818ca2b42e2995482
Component: engine
2015-03-26 10:58:35 -07:00
0b6cf588fa
Merge pull request #11791 from moo-mou/11768-vetwarning
...
Fix vet warning
Upstream-commit: a196cc943ccb02a857c8509b6badb12e8e2071ac
Component: engine
2015-03-26 10:52:07 -07:00
3c5e5abec3
Merge pull request #11811 from VladimirAus/11585-3
...
#11585 : README for pkg/signal.
Upstream-commit: ec8f61044a7da10c5ddbf085c27afde4ea95c143
Component: engine
2015-03-26 10:44:09 -07:00
d81e78f3e1
Merge pull request #11821 from duglin/FixCPUTest
...
Fix TestBuildResourceConstraintsAreUsed Cpuset test
Upstream-commit: 5f295a6e8267f8759c38d4ba249f65ae5a5b0a5f
Component: engine
2015-03-26 10:42:43 -07:00
d294d535e9
Removing sudo from examples
...
We now have instructions in our Unix installs about setting up
docker group to avoid sudo. Also, Mac/Windows shouldn't use
sudo. So, I've removed sudo from our examples and added a
section at the top reminding them that if they have to use
sudo to run docker they can change that.
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: a4609a1dfbcfb2fea10aa2be15124e0809528d04
Component: engine
2015-03-26 10:13:19 -07:00
9ce3328aa4
Merge pull request #11800 from hqhq/hq_fix_create_issue
...
add back job.Errorf
Upstream-commit: 2bbf1987d2218f22e1df705c9bf1e0ce47a61faa
Component: engine
2015-03-26 11:12:55 -06:00
137e45c97e
Merge pull request #11786 from peggyl/golint-api-client
...
Fix golint errors for casing in api/client package
Upstream-commit: b9d19fdaef68681186411a8ab2024211dda409d6
Component: engine
2015-03-26 09:28:33 -07:00
