0ee9f8042e
Merge pull request #11776 from shin-/security_opt_docs_fix
...
API docs fix for SecurityOpt parameter.
Upstream-commit: f84086be2a570f02cbde3a4bd018d535def964d4
Component: engine
2015-03-25 18:20:59 -07:00
6b3e5068b8
Explain advanced contribution workflow more
...
Explain why advanced contribution workflow have to be so complex
Signed-off-by: Maxim Kulkin <mkulkin@mirantis.com >
Upstream-commit: b4d7b0f8657cd29147dd3215876b9f739ead7097
Component: engine
2015-03-25 18:04:41 -07:00
6ebf43180d
Merge pull request #11779 from blatyo/add_ulimit_test
...
Add test for successful Ulimit Parse.
Upstream-commit: 667452ec63b2965ae6291b87f8d10f0a9913a922
Component: engine
2015-03-25 17:34:58 -07:00
b267f3bec0
Merge pull request #11778 from blatyo/fix_ulimit_string
...
Fix (*Ulimit).String() function. Closes #11769 .
Upstream-commit: d0b2cfa1f1d95c1d25716dd18a9f3899a72d58c3
Component: engine
2015-03-25 17:33:00 -07:00
5ce782f869
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 >
Upstream-commit: ba222f7bc89f7d7f3c83b54cb0a3567ca3694f34
Component: engine
2015-03-25 20:32:50 -04:00
5926e0ab7b
Add test for successful Ulimit Parse.
...
Signed-off-by: Allen Madsen <blatyo@gmail.com >
Upstream-commit: a97ca674f06cc7e70cc6defd617afa7775a8480a
Component: engine
2015-03-25 20:03:26 -04:00
940c2dcc3c
Fix (*Ulimit).String() function. Closes #11769 .
...
Signed-off-by: Allen Madsen <blatyo@gmail.com >
Upstream-commit: cb168e5622fefc42df1fa0e355aa5922c74329e8
Component: engine
2015-03-25 19:39:05 -04:00
fa879dbf22
SecurityOpt parameter is singular, and belongs in HostConfig
...
since API 1.17
Signed-off-by: Joffrey F <joffrey@docker.com >
Upstream-commit: 61dba98608446f10b516a677753877cc3160173f
Component: engine
2015-03-25 16:25:13 -07:00
ea26fe641c
Merge pull request #11757 from ankushagarwal/Fds
...
Rename 'Fds' to 'File Descriptors' in docker info
Upstream-commit: e589dc7424dfad993f1fc646b66fa04306a2df2d
Component: engine
2015-03-25 16:24:57 -07:00
f2b849a215
running code formatter as @tiborvass requested
...
Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com >
Upstream-commit: 5dde99163e7674814f2d9be0bc22c9618fa70b89
Component: engine
2015-03-25 19:24:55 -04:00
9d3f3b6126
Merge pull request #11772 from aneshas/11718-redundant-else
...
Fixed redundant else
Upstream-commit: 89e7f5e6611e6237482d986777a3451034f7e4c0
Component: engine
2015-03-25 16:16:16 -07:00
ac25dc4e2f
Merge pull request #11773 from icecrime/unused_securityopt_field
...
Remove unused runconfig.Config.SecurityOpt field
Upstream-commit: f14bf9b53c2fd6b797f830a1d5fd49752963d86e
Component: engine
2015-03-25 16:15:41 -07:00
6448734eca
Merge pull request #11771 from aneshas/11719-redundant-elses
...
Removed redundant elses
Upstream-commit: 8cd3564ec1e4450d2f991f61f74ba2dc488ffe0d
Component: engine
2015-03-25 16:06:30 -07:00
6340350f2f
Merge pull request #11745 from imdreamrunner/patch-1
...
Add missing newline for bash code example
Upstream-commit: 8d62e12f4dfdbe795cae1a4bf4571aae3ea6b6ea
Component: engine
2015-03-25 16:58:55 -06:00
481e04f931
Merge pull request #11774 from thaJeztah/fix-workdir-typo
...
Fix typo "WRKDIR" -> "WORKDIR"
Upstream-commit: 136f8fa2ff07c64a5e6fc85476c172994d1be587
Component: engine
2015-03-25 16:55:57 -06:00
d7a68d4395
Merge pull request #11748 from minimum2scp/fix/debootstrap
...
removed unnecessary tabs from /usr/sbin/policy-rc.d, and /sbin/initctl for mkimage.sh debootstrap
Upstream-commit: 87e877e3c17b3f8b591f7136c3bf6bf90ec18532
Component: engine
2015-03-25 16:55:13 -06:00
c24a1cf195
Fix typo "WRKDIR" -> "WORKDIR"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6fdb583f3899362db13292ad3cad31fec970d638
Component: engine
2015-03-25 23:47:38 +01:00
5e9f154fc1
Remove unused runconfig.Config.SecurityOpt field
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: e39646d2e1becb652ff0a8a7d131067f38a94247
Component: engine
2015-03-25 15:46:42 -07:00
d222ef85ca
Fixed redundant else
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
Upstream-commit: 3d7b9e8f30a48bc2e929d8ac3d82f70778e99b59
Component: engine
2015-03-25 23:44:32 +01:00
a4f43804e5
Merge pull request #11761 from runcom/11731-remove-engine-status
...
Remove engine.Status, replace with standard go error
Upstream-commit: e6cbffe94b9faf282332a4db3e07c97da4d31a83
Component: engine
2015-03-25 15:41:02 -07:00
6200bccb4a
Removed redundant elses
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
Upstream-commit: 1b6065de8f46edc8f36f6b3734fe64175e413dc3
Component: engine
2015-03-25 23:34:00 +01:00
a16f3d6cb4
Remove engine.Status and replace it with standard go error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c79b9bab541673af121d829ebc3b29ff1b01efa2
Component: engine
2015-03-25 22:32:08 +01:00
ef0a4fa398
Add godoc-style docstrings to Cmd... methods
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
Upstream-commit: b5d0380108dde9e96d51bb01821860a0799dee0d
Component: engine
2015-03-25 14:17:11 -07:00
a2c5155c6a
Merge pull request #11758 from crosbymichael/update-libct-mar25
...
Update libcontainer to a6044b701c166fe538fc760f9e2
Upstream-commit: 3d9cbf0e7176e8aa5d4078cd00a400e1dcc5169d
Component: engine
2015-03-25 12:17:33 -07:00
12d1265301
Rename Fds to File Descriptors in docker info
...
This makes the docker info more readable. Also change a log line
in a test file renaming Fds
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 161c2e5e74e06b863b91d0f325faf083530ae1b8
Component: engine
2015-03-25 12:04:15 -07:00
a9e8a0831a
Merge pull request #11691 from matthewkmayer/feature-dont-create-bind-dirs
...
Removes bind dir creation in daemon start.
Upstream-commit: 54a607a22d625a06fabf604053748f708afc4d94
Component: engine
2015-03-25 11:44:13 -07:00
aa398ec2d6
Merge pull request #11756 from vbatts/vbatts-remove_trailing_whitespaces
...
.: remove trailing white spaces
Upstream-commit: 667df336b7003fe4993eb1fd051efb6550c5e425
Component: engine
2015-03-25 11:36:10 -07:00
645e076e86
Update libcontainer to a6044b701c166fe538fc760f9e2
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: b4196f7892f4aeb11318bbd6c2d68227868e27e2
Component: engine
2015-03-25 11:32:14 -07:00
da613cd280
Merge pull request #11753 from vbatts/vbatts-btrfs_ifdef_build_version
...
btrfs: #ifdef for build version
Upstream-commit: e6e2893fa3557684b70e0d79ba2699f499c964ea
Component: engine
2015-03-25 11:25:49 -07:00
83e6c527aa
removed unnecessary tab from /usr/sbin/policy-rc.d, and /sbin/initctl
...
Signed-off-by: YAMADA Tsuyoshi <tyamada@minimum2scp.org >
Upstream-commit: 09165e0fe0b2b1b0dd2c9be45a7ca7f53c2fae29
Component: engine
2015-03-26 03:10:34 +09:00
b18a43073b
btrfs: #ifdef for build version
...
We removed it, because upstream removed it. But now it will be coming
back, so work with it either way.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: b76e300b4cd6ce4446170c7170a2734f7994a6c1
Component: engine
2015-03-25 13:56:51 -04:00
d4497c7a2b
.: remove trailing white spaces
...
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 7617ec176d266650b19c2378ccab4aa41e6dc5a2
Component: engine
2015-03-25 13:38:17 -04:00
f7a30f1c84
Add missing newline for bash code example
...
Signed-off-by: Zhou Xinzi <imdreamrunner@gmail.com >
Upstream-commit: ed7907a988fe336711603e38c8b79d673e87c902
Component: engine
2015-03-26 01:24:00 +08:00
24a2c3a692
Merge pull request #11751 from tiborvass/revert-validate-spaces
...
Revert "Dealing with trailing whitespaces"
Upstream-commit: a0cfe83435e5f62fc8de4f18b5120332bbfa37c2
Component: engine
2015-03-25 13:01:58 -04:00
5d59835e1f
Merge pull request #11750 from MabinGo/adjust_log_func_call
...
Use appropriate func to record logs according to different scene
Upstream-commit: 444c967aece4ef021aefe209a067c5d94ceb817e
Component: engine
2015-03-25 09:41:41 -07:00
23d80e7ccb
Merge pull request #11729 from icecrime/11048_carry
...
Carry #11048
Upstream-commit: 5f7e142c46574c473a3b9e9dee4ef3e956b6c645
Component: engine
2015-03-25 09:27:07 -07:00
38fb27e1f6
Merge pull request #11749 from duglin/FixLogin
...
Fix login
Upstream-commit: 9359e2bed349a7c406e90ac0b309d667872c837e
Component: engine
2015-03-25 09:22:52 -07:00
912f4efa7e
Merge pull request #11730 from runcom/11725-fix-volume-initialize-error-check
...
Fix volume initialize error check
Upstream-commit: bb65c808df825181250935c642270df220e554f7
Component: engine
2015-03-25 09:19:42 -07:00
217062d14b
Merge pull request #11533 from hqhq/hq_fix_decode
...
fix decode data loss when using int64 in json
Upstream-commit: 639d60b5380157c05d72682812ba879d84f70c4e
Component: engine
2015-03-25 10:17:10 -06:00
abd71318ca
Revert "Dealing with trailing whitespaces"
...
The validation script from #10681 is too pedantic, and does not handle
well situations like:
```
cat <<EOF # or <<-EOF
Whether the leading whitespace is stripped out or not by bash
it should still be considered as valid.
EOF
```
This reverts commit 4e65c1c319afffc325853b88c9aef0c42ec83482.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 0252ad0adc37a34b88fa908ae74a13b940febdcb
Component: engine
2015-03-25 10:04:56 -06:00
2f53de071f
Fix login
...
Right now it returns:
```
FATA[0001] json: Unmarshal(non-pointer types.AuthResponse)
```
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0d65069a175b08015147ecf57a93f7c16ad4e37c
Component: engine
2015-03-25 08:45:14 -07:00
8e0111a19d
Merge pull request #11737 from duglin/FixTestOutput
...
TestBuildCancelationKillsSleep sends exec cmd to stdout
Upstream-commit: f08e9f44a9d27dfd3780e8c3d89b0236f7672688
Component: engine
2015-03-25 08:45:09 -07:00
68a14edc61
Fix volume initialize error check, Fixes #11725
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 1d1230ea32544bcc646a5b79ddf9cc66b70c66cd
Component: engine
2015-03-25 16:36:00 +01:00
94d3e5ce63
Use appropriate function to record logs
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: b46beb170fda938c373a67671919c587aeda92db
Component: engine
2015-03-25 23:32:12 +08:00
2e05bc553e
Merge pull request #11741 from aneshas/11720-redundant-else
...
Fixed redundant else in GetDeviceStatus
Upstream-commit: 3bed92a7bfcfb404b883339c973ee3833c239e9e
Component: engine
2015-03-25 08:28:38 -07:00
9bc92efdf4
Merge pull request #11735 from Sirupsen/listenbuffer-promote
...
listenbuffer: add docs and test
Upstream-commit: 7c2cc476da6fcff4dd1304d41f9b67a0f4b309b7
Component: engine
2015-03-25 08:14:21 -07:00
aaf24068e2
Fix the events, pull test to use v2 local server
...
Closes #10964
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: be5de5bcb8d39515e374219aa95bd2ac855d6918
Component: engine
2015-03-25 15:12:47 +00:00
8d4b28771e
Merge pull request #11715 from duglin/DocCliEnvVars
...
Add some info about what environment variables are available
Upstream-commit: dea660874ca3008af5c326a193ae5c657fefb30d
Component: engine
2015-03-25 07:29:27 -07:00
dc0bb844c3
Merge pull request #11694 from hqhq/hq_add_memsw_example
...
docs: add memory and swap memory usage examples
Upstream-commit: 67eb10defe0617c3dbb563002474e8e85b97b7bb
Component: engine
2015-03-25 07:01:44 -07:00
ac917d33bd
Fixed redundant else in GetDeviceStatus
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
Upstream-commit: e479e1c9f7d327f396eebc46d446cf4ee34513f7
Component: engine
2015-03-25 09:53:04 +01:00
