15b50925f1
Merge pull request #5642 from jmccrohan/master
...
Update mkimage-debootstrap "ubuntuLatestLTS" to "trusty"
Upstream-commit: ddd0470ed1487f1b12286f3213e1d8e98021509d
Component: engine
2014-05-07 09:45:22 -06:00
d7be599a05
mkimage-debootstrap: set ubuntuLatestLTS as Trusty
...
Ubuntu 14.04 LTS (Trusty Tahr) was released on Thu, 17 Apr 2014; Update
ubuntuLatestLTS accordingly.
Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com > (github: jmccrohan)
Upstream-commit: 9e64a4d862e38ead4c2708ce61663f176844406b
Component: engine
2014-05-07 08:26:24 +01:00
e2dc002b85
Merge pull request #5634 from vieux/improve_mflag_usage
...
Add support for \n in usages
Upstream-commit: bd9b27fe18e92f4fb9123d2f254b16818911f11a
Component: engine
2014-05-07 13:53:04 +10:00
a4be23f31a
Merge pull request #4 from SvenDowideit/improve_mflag_usage_docs
...
update the docs for the new \n rendering
Upstream-commit: 275faf06e8e59ccf448c8e99a6c4c4a93ee59da1
Component: engine
2014-05-06 19:54:47 -07:00
3893d734fc
Merge pull request #5643 from crosbymichael/fix-native-pid
...
Set container pid for process in native driver
Upstream-commit: 41b2874b99fa308b23bd9984b28f2c89f69ebd14
Component: engine
2014-05-06 18:02:55 -07:00
1e327c2bc7
Set container pid for process in native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 62e8ddb5791b9ee62c3f4361084dda4a5d7760e1
Component: engine
2014-05-06 17:04:04 -07:00
9f2043420a
update the docs to reflect the nice \n handling
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: cfb232cff27da2dd46ec04a5bf6699ab1d1df91c
Component: engine
2014-05-07 09:40:49 +10:00
fdccd2aaa1
improve some usages
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b622da3cfe211d31df69e72a93ed4fae872aca65
Component: engine
2014-05-06 21:32:12 +00:00
29bfaa0d20
use tabwriter to display usage in mflag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 77098d5b5bf8840a1179380b34aedb26139b9d65
Component: engine
2014-05-06 21:31:21 +00:00
49adbc4838
Merge pull request #5622 from SvenDowideit/net-host-docs
...
Update the run --net cli help to include the 'host' option
Upstream-commit: d7166536e7f71ca87a8c37d2eb1c06184c9f3bd6
Component: engine
2014-05-07 07:11:41 +10:00
36de1a047f
Merge pull request #5631 from vmarmol/cpuacct-usage
...
Export cpuacct CPU usage in total cores over the sampled period.
Upstream-commit: 5c12a27838b88580aaa6fd967a9f0b60d3e838af
Component: engine
2014-05-06 11:47:55 -07:00
852833b5b7
Fix logo in README.md
...
Upstream-commit: 8d07c2d1aeb3326f1f62854e6adfd26f0d8e0342
Component: engine
2014-05-06 11:39:11 -07:00
7ab4226907
Export cpuacct CPU usage in total cores over the sampled period.
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: 543e60eb60fed2734c10953216003325beddd536
Component: engine
2014-05-06 16:56:39 +00:00
8376ec5af9
Merge pull request #5630 from rjnagal/libcontainer-fixes
...
Check supplied hostname before using it.
Upstream-commit: 818648ff9f9e506e2d296fb73ef55dc8f87648fb
Component: engine
2014-05-06 09:49:52 -07:00
23cfbb7add
Merge pull request #5629 from vmarmol/fix-systemd-softlimit
...
Remove support for MemoryReservation in systemd systems.
Upstream-commit: 7e3a1b652193abd8379905cb4dac2df53dc634fb
Component: engine
2014-05-06 09:48:33 -07:00
963c5715cb
Merge pull request #5627 from cyphar/integration-cli-fixes
...
Fixed completely broken integration-cli tests
Upstream-commit: d16fcc628e5b3229e24ee50579a81379f4040414
Component: engine
2014-05-06 09:35:30 -07:00
667984ea8a
Merge pull request #5626 from cyphar/networkfs-etchosts-tests
...
Fixed broken tests for pkg/networkfs/etchosts
Upstream-commit: 5034b658e30302095cfbd573a9ce7550570698e7
Component: engine
2014-05-06 09:31:06 -07:00
7754f52438
Remove support for MemoryReservation in systemd systems. This has been
...
deperecated since systemd 208.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: 69d43b2674aa8ed69c641556cae68d405505a45b
Component: engine
2014-05-06 15:53:38 +00:00
e1bf9e3403
integration-cli: docker_cli_links: fixed broken tests
...
The tests weren't ... tested when last edited, this patch fixes
them so that they run and pass correctly.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: 924979259ec4c9ef6beab0468325f1cb04deaacb
Component: engine
2014-05-07 01:05:15 +10:00
0dedb88d50
pkg: networkfs: etchosts: fixed tests
...
This patch fixes the fact that the tests for pkg/networkfs/etchosts
couldn't build due to syntax errors.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: 14f65ab83b4f72ea56b3e98023e941474d4e9dd8
Component: engine
2014-05-07 00:42:22 +10:00
670dbc4add
Merge pull request #5616 from nirvdrum/patch-2
...
Use the contraction for "it is."
Upstream-commit: ba6a732357ce9e2fa3292ce8b46d17dadfe22468
Component: engine
2014-05-06 11:33:41 +01:00
65cf6af87c
Update the run --net cli help to include the 'host' option
...
and then add that to the run and cli docs
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 9eeff6d099a951c3a3e45d63ce2f8cb158aaeb6c
Component: engine
2014-05-06 20:26:44 +10:00
e44f2c5b1c
Merge pull request #5056 by Bryan Murphy <bmurphy1976@gmail.com>
...
"add linked containers to hosts file"
Upstream-commit: 95d81dada6f3e3bf63b73d0f99165f9635a0a7e4
Component: engine
2014-05-05 20:04:01 -07:00
78dce02460
Simplify integration test for link + hostname.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: dc605c8be76760951d0d12e67409602c7b4b7973
Component: engine
2014-05-05 19:51:47 -07:00
1d128ba235
add linked containers to hosts file
...
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com > (github: bmurphy1976)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Tested-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 53f38a14cd6b61a6b5df68cc3694dcba2b0c1eb7
Component: engine
2014-05-05 19:40:27 -07:00
6653f5c1ed
Add alex as devmapper and btrfs maintainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: cd818950919f0da868b36e32033607d5e6c98466
Component: engine
2014-05-05 19:40:27 -07:00
5b021e4d5b
Merge pull request #5601 from crosbymichael/alex-maintainer
...
Add alex as devmapper and btrfs maintainer
Upstream-commit: 839b06b121800a9b222fe673ab54cdad918ba883
Component: engine
2014-05-05 17:10:05 -07:00
e892d9d992
Use the correct "it's."
...
Upstream-commit: 2b0f88383afba28fe7b0bba989d115c2f5e2cc87
Component: engine
2014-05-05 20:08:35 -04:00
98de875d78
Merge pull request #5614 from crosbymichael/move-attach-to-daemon
...
Move Attach from container to daemon
Upstream-commit: affacfab08281e7d9bbd7c0d83bc0a842cb764aa
Component: engine
2014-05-05 16:56:11 -07:00
9343517f87
Move Attach from container to daemon
...
This moves the Attach method from the container to the daemon. This
method mostly supports the http attach logic and does not have anything
to do with the running of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 41cfaa738c2d8583ecca50948c9df5eda3dfd7f1
Component: engine
2014-05-05 16:48:56 -07:00
deff094dc8
Merge pull request #5613 from vieux/better_error_handling
...
propagate errors write
Upstream-commit: b4ac4228f518ce3af125752fd46ae667dcff8042
Component: engine
2014-05-05 16:28:15 -07:00
a2cfcf5177
propagate errors write
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 55f3e72d7f6b996c0874d402c95f4b8c9a7d80d9
Component: engine
2014-05-05 23:23:14 +00:00
dfb1a0bff0
Merge pull request #5354 from alexlarsson/cgroups-systemd-fixes
...
cgroups: Update systemd to match fs backend
Upstream-commit: 0b15944cb047e6467f399ebf5c3f93262fe4c06f
Component: engine
2014-05-05 16:00:56 -07:00
80dddf62f3
Merge pull request #5597 from jamtur01/docs-simplify-osx-install
...
Fixed the horrible OSX installation docs
Upstream-commit: df5827dd02f115811ba82bf8ae979ada292967f5
Component: engine
2014-05-06 08:55:14 +10:00
4ec4fca8da
Merge pull request #5609 from crosbymichael/move-env-gen
...
Upstream-commit: 0736eb6d164a58388acb9f6f3993250d76b8665b
Component: engine
2014-05-05 15:52:47 -07:00
155c48e646
Merge pull request #5611 from vieux/networkfs_pkgs
...
add 2 networkfs pkgs
Upstream-commit: ab58dd5a44b4e7d35a20a2156e91a9a52d3d8766
Component: engine
2014-05-05 15:52:14 -07:00
ac35d8965e
add resolvconf
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 3744452ecf46351758478e99795e20b186a1bee4
Component: engine
2014-05-05 22:55:32 +00:00
60d5f26ff6
add etchosts
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: a1a029f6d7f980960135c1346a1e9f7830692fac
Component: engine
2014-05-05 22:43:38 +00:00
9cb0c5e8bd
Merge pull request #5600 from unclejack/sha512_registry_support
...
import sha512 to make sha512 ssl certs work
Upstream-commit: eadf004fcba8431769b03125a6d6a8d415c79f5f
Component: engine
2014-05-05 15:27:11 -07:00
4d22840b79
Move envconfig generation to lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 4994b0fe5459996691dde18155a7b712762e8e53
Component: engine
2014-05-05 14:45:14 -07:00
2ab64a1a1a
Merge pull request #5608 from crosbymichael/net-flag-refactor
...
HOTFIX Update after namespace refactor
Upstream-commit: 222605b5fb9b9985a546807534777fbd2fc49c3b
Component: engine
2014-05-05 13:58:09 -07:00
df4270e3f2
Update after namespace refactor
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 01fec73ba4cff45ac08c0330ea0d67aff70ebf8e
Component: engine
2014-05-05 13:56:18 -07:00
d5f89ec02b
Merge pull request #4441 from crosbymichael/add-net-flag
...
Add --net flag to docker run and allow host network stack
Upstream-commit: 70fef1460a9d253bdf164d70d7057ec4ee497e08
Component: engine
2014-05-05 13:54:55 -07:00
1952f255b6
Merge pull request #5602 from crosbymichael/libcontainer-enable
...
Improve libcontainer namespace and cap format
Upstream-commit: 2165a4993b849c3ac4a6f3ccb7af91b0d1f79b50
Component: engine
2014-05-05 13:50:08 -07:00
8b6dc7dcb1
Merge pull request #5575 from vieux/pr-5428
...
Upstream-commit: 51933bd5e1d10eb4a3151088cf344d0d6e06a192
Component: engine
2014-05-05 13:48:36 -07:00
0bd739f261
Merge pull request #5538 from shykes/pr_out_engine_catchall_handler_is_shadowed_by_specific_handlers
...
Upstream-commit: 7c3a06634b8aeb10494d924d5461566aa7228a87
Component: engine
2014-05-05 13:48:11 -07:00
4c66bae2c4
Merge pull request #5596 from dotcloud/contrib-fix
...
Post-commit hook URL fix
Upstream-commit: 07db13509b1e793e37a826fed2bd3924b5b85862
Component: engine
2014-05-05 13:44:48 -07:00
db1f1daa38
Merge pull request #5400 from bmatsuo/5398-fix-pkg/graphdb-osx
...
Upstream-commit: 99be2353329c7106958a852eb08776fac5c0c2b0
Component: engine
2014-05-05 13:41:43 -07:00
dee350b3ad
Merge pull request #5604 from nirvdrum/patch-1
...
It's its.
Upstream-commit: 13c1865541bf368cf3e8955559ae03704fae2a3c
Component: engine
2014-05-05 21:49:47 +02:00
9af67222a6
Merge pull request #5580 from tianon/update-vendor-versions
...
Update vendored deps that have a proper version number to use said specific versions
Upstream-commit: 168452f9b03651e979f99647865c199d497d2051
Component: engine
2014-05-05 13:45:03 -06:00
