04fe859915
listenbuffer: add docs
...
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com >
Upstream-commit: 67bd859481a9d5c7a2ccf4c593e65d473ab3f106
Component: engine
2015-03-25 03:11:34 +00:00
6eeff65133
listenbuffer: add test
...
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com >
Upstream-commit: b6b8032a1759905adbb68355e994b0405054bcc0
Component: engine
2015-03-25 03:11:33 +00:00
9709821e24
Merge pull request #10527 from mfojtik/lxc_11
...
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
Upstream-commit: 22dba32b4dab6cec7b7a2d6dffa94a5fe713c2d3
Component: engine
2015-03-24 17:37:27 -07:00
1da629c7e0
Merge pull request #11018 from delftswa2014/10958-pidfile
...
Moves pid file operations to /pkg/
Upstream-commit: d214e640321ffe318fb3b89bdc55320549a7e4ae
Component: engine
2015-03-24 17:20:52 -07:00
9a660a7843
Merge pull request #11728 from crosbymichael/lxc-mkdir
...
Mkdir for lxc root dir before setup of symlink
Upstream-commit: aecc5b606f7243dce7bb68bd8c94327198be02ea
Component: engine
2015-03-24 16:25:12 -07:00
d00e59a1a0
Merge pull request #10681 from noironetworks/whitespaces-cleaner
...
Removed all trailing whitespaces from every text file
Upstream-commit: 322095ed63ec0943378485f8f8d4cabcfd471875
Component: engine
2015-03-24 16:02:14 -07:00
e0fdaa87e8
Moved pidfile from utils to pkg
...
Fixes #10958 by moving utils.daemon to pkg.pidfile.
Test cases were also added.
Updated the daemon to use the new pidfile.
Signed-off-by: Rick Wieman <git@rickw.nl >
Upstream-commit: 772833274fd84b3c960ccab14258b7e5a00b18cd
Component: engine
2015-03-24 23:59:32 +01:00
08138d304c
Mkdir for lxc root dir before setup of symlink
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 246cab90f216e68c25178ffd19756ab864b809d0
Component: engine
2015-03-24 15:53:23 -07:00
d5ac91b394
Merge pull request #11716 from LK4D4/root_in_run
...
Use /var/run/docker as root for execdriver
Upstream-commit: f3fc857e018dc919fddfea645b8308379343cb4e
Component: engine
2015-03-24 14:58:30 -07:00
b486c71c0f
Merge pull request #11651 from vbatts/vbatts-dont_rm_dockerversion
...
make.sh: leave around the generated version
Upstream-commit: 46be6bb4033a5a4be9b10ab960f74641a8d79f32
Component: engine
2015-03-24 14:47:42 -07:00
c081961ccf
Merge pull request #11726 from noxiouz/history-swap-parallel-assignment
...
History.Swap Use parallel assignment to swap elements
Upstream-commit: 979283a166126f3849102f98f1a2577ddc240b19
Component: engine
2015-03-24 14:43:44 -07:00
2ae56c859a
Merge pull request #11679 from avidas/api-common-constants-document
...
Add comments to api/common constants
Upstream-commit: 73dab8205a77320d728d5d77880b2e1109d07a67
Component: engine
2015-03-24 14:43:09 -07:00
82a679e32d
Merge pull request #11727 from tiborvass/carry-11441
...
Carry 11441: fix docker ps help message
Upstream-commit: a4e1de58a3019e7ab9e143af3243713f0e80fe15
Component: engine
2015-03-24 14:42:02 -07:00
d83a675d7e
fix docker ps help message
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
Upstream-commit: a153e80f72274c05589145011c16cc1d7f8ee75f
Component: engine
2015-03-24 15:33:53 -06:00
f0be9c4403
History.Swap Use parallel assignment to swap elements, as it's
...
a more idiomatic way for golang than using a temp variable.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
Upstream-commit: fc325274e84a0c16b758e3d6b121c9af1150cce2
Component: engine
2015-03-25 00:13:13 +03:00
63a73186e0
Merge pull request #11713 from icecrime/update_gitignore
...
Update .gitignore
Upstream-commit: 46321a1e4fd96fe9646ed62d3c6dfb1168933044
Component: engine
2015-03-24 14:03:31 -07:00
cd0df47776
Merge pull request #11712 from 4gh/test_httputils
...
add tests for pkg/httputils
Upstream-commit: 439e0ab23f57f61ac8fcb1796dfc489a4305e2be
Component: engine
2015-03-24 13:56:31 -07:00
80a1056333
Merge pull request #11663 from arthurbarr/master
...
Fix #11589 by adding README and comments to exported functions
Upstream-commit: 28b96cc61357d03cca8d93cd8f27bb5fc0247c2b
Component: engine
2015-03-24 14:45:05 -06:00
02a1b68a98
Merge pull request #11417 from rhatdan/btrfs
...
Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version
Upstream-commit: 8fc9e400866456d72727afb9f8ea3a23abc4282e
Component: engine
2015-03-24 16:00:15 -04:00
6c54305281
Merge pull request #10283 from rhatdan/dev
...
We want to allow the sharing of /dev from the host into the container.
Upstream-commit: 131b29f7bc003ab6e6fc1d4e06fcf6764f4f7e6d
Component: engine
2015-03-24 12:57:44 -07:00
558349d8ce
Merge pull request #11689 from calavera/ipallocator_refactor
...
Use a structure to keep the allocated ips pool.
Upstream-commit: f7900cdd67e71a418d3cbfeb1b23315c5be78bdf
Component: engine
2015-03-24 12:42:30 -07:00
1e0e1eb7fb
Merge pull request #11717 from moxiegirl/tweaks-from-contributathon
...
Adding in comments from party
Upstream-commit: d20ba329d1cf2a0cb3a93bd69fc9e6247f338dcc
Component: engine
2015-03-24 12:18:18 -07:00
85625e1ab5
Merge pull request #11709 from paulbellamy/11626-portallocator
...
Refactor global portallocator and portmapper state
Upstream-commit: ce372cd6642ff0dd2de9eece489a847f088eb3bd
Component: engine
2015-03-24 13:51:00 -05:00
4e35bd8884
Merge pull request #11710 from runcom/11599-refactor-pkg-common
...
Refactor pkg/common, Fixes #11599
Upstream-commit: 8eee55a35c8161bde7bee50231b67f8e33dd16e0
Component: engine
2015-03-24 11:45:07 -07:00
0185f15317
Use a structure to keep the allocated ips pool.
...
Fixes #11624 .
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 7e95b13460a58db75630d2d795482f39c68762c2
Component: engine
2015-03-24 11:41:44 -07:00
0b59de6c55
Adding in comments from party
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 6de806f348cf802e80a729f390bab777df146ca7
Component: engine
2015-03-24 11:25:26 -07:00
8d8bb83013
Merge branch 'master' of github.com:docker/docker into btrfs
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 25c4a923424bdc659cdb18239290196272d17423
Component: engine
2015-03-24 14:14:54 -04:00
a6001c7df9
Use /var/run/docker as root for execdriver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 1e788ec9855058913de6ac8a2be7acee0f001954
Component: engine
2015-03-24 10:47:30 -07:00
0e96e605fc
Fix #11589 by adding README and comments to exported functions
...
Signed-off-by: Arthur Barr <arthur.barr@uk.ibm.com >
Upstream-commit: 557cca536f82a25f110399fcd2964e07f5d51dcf
Component: engine
2015-03-24 17:30:19 +00:00
1e47557825
Refactor pkg/common, Fixes #11599
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: b80fae735684406d848b16a0f148a746e17ed25f
Component: engine
2015-03-24 18:19:59 +01:00
04b5dbec35
Sort .gitignore content
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 4433b4c19e7eb63937e211cc0684560800799e68
Component: engine
2015-03-24 09:40:07 -07:00
2db48ea0b7
add tests for pkg/httputils
...
closes #11597
Signed-off-by: Frank Herrmann <fgh@4gh.tv >
Upstream-commit: 2770a88413a98fcb3dd6e36e91c5041e5fe082eb
Component: engine
2015-03-24 16:27:09 +00:00
f56d95c837
Merge pull request #11697 from pdxdan/7447-GID-Doc
...
Updated Dockerfile and docker-run documentation for USER commands
Upstream-commit: 4b4bdb5be58943c24ca64fd8b0b69cd259515a23
Component: engine
2015-03-24 09:17:41 -07:00
5748e209c9
Merge pull request #11693 from jessedearing/login_docs
...
Add documentation about the semantics of `docker login` @jessedearing thanks for the PR!
Upstream-commit: dbd00822ece83b614ec92454bc8e20b5238ccb4d
Component: engine
2015-03-24 09:13:53 -07:00
dca8944dc0
Merge pull request #11688 from afewremarks/master
...
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
Upstream-commit: d827b4d235f7604e2a4fa7ad95e2d75dafb4ac27
Component: engine
2015-03-24 09:12:00 -07:00
a48304b35d
Merge pull request #11670 from runcom/11607-api-route-post-auth-response
...
Return AuthResponse from postAuth api endpoint
Upstream-commit: 9d7f58100f6ba8f954dc4fc6c7a2171c79d940af
Component: engine
2015-03-24 08:26:07 -07:00
8deca36145
Merge pull request #11690 from ssdonline/fix_issue_11683
...
Fixes error #11683
Upstream-commit: 05c23cad85bde1d76ccd1d398f5a839ee8ee87d9
Component: engine
2015-03-24 06:28:24 -07:00
2db07bb3f2
Merge pull request #11701 from HuKeping/typo
...
Fix minor typo
Upstream-commit: 1ad6aae2725a0555e14d9c5fb237df4782575a6b
Component: engine
2015-03-24 08:03:09 -04:00
5999274fa2
Fix minor typo
...
Fix minor typo and make the comments of version-comparison functions
uniform.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 96d8c3584cedddfc69c01bda3f512d495b21ac47
Component: engine
2015-03-25 00:46:22 +08:00
8938696741
Refactor global portallocator and portmapper state
...
Continuation of: #11660 , working on issue #11626 .
Wrapped portmapper global state into a struct. Now portallocator and
portmapper have no global state (except configuration, and a default
instance).
Unfortunately, removing the global default instances will break
```api/server/server.go:1539```, and ```daemon/daemon.go:832```, which
both call the global portallocator directly. Fixing that would be a much
bigger change, so for now, have postponed that.
Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com >
Upstream-commit: 87df5ab41b3f9b2bdd8682f4afd41dac78f7e96d
Component: engine
2015-03-24 11:15:30 +00:00
287b673e43
Return AuthResponse from postAuth api endpoint, Fixes #11607
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: babd1b3e1fd7be7674f6e96f264b1b841aeba3b9
Component: engine
2015-03-24 09:57:01 +01:00
0b2b56ecf5
Add documentation about the semantics of docker login
...
Fixes #10550
Signed-off-by: Jesse Dearing <jesse.dearing@gmail.com >
Upstream-commit: ed0d2ac3b799b8f7b2508176e65bfe8583881c83
Component: engine
2015-03-23 23:53:50 -07:00
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
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
616291f1ff
Added documentation for specifying groupname or GID for commands. Also clarified used of the possible use of multiple USER commands in a Dockerfile.
...
Signed-off-by: Dan Anolik <dan@anolik.net >
Upstream-commit: a57d7c5c796a1affcfa05ee6e7ea586750a9292f
Component: engine
2015-03-23 20:47:04 -07:00
6609e10340
Fixes error #11683
...
Signed-off-by: Swapnil Daingade <swapnil.daingade@gmail.com >
Upstream-commit: 6fa6b5bcbb707a1fe709c5272035b79635c29a78
Component: engine
2015-03-23 23:45:55 -04:00
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
d3b04844fa
Add comments to api/common constants, closes #11583
...
Signed-off-by: Avi Das <andas222@gmail.com >
Upstream-commit: c136591f40c34de51bbb0691ae69f393ff8b2f0e
Component: engine
2015-03-23 22:35:41 -05:00
7c33403b52
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
...
Signed-off-by: Mark West <markewest@gmail.com >
Upstream-commit: ef0275c66c420944dd3de4647d2d25b78f8f1b5a
Component: engine
2015-03-23 20:16:40 -07:00
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
