Aanand Prasad
f0eaf84cb9
Merge pull request #217 from orchardup/0.4.1
...
Ship 0.4.1
2014-05-08 12:51:35 +01:00
Ben Firshman
257a171c0c
Ship 0.4.1
2014-05-08 12:43:09 +01:00
Ben Firshman
3c5e818b49
Update install docs for Docker 0.11.0
2014-05-08 12:21:46 +01:00
O.S. Tezer
e4f4ce83d2
Merge pull request #5659 from ryanaslett/master
...
Trivial Documentation Change: The Go template is a better pattern for documentation.
2014-05-08 10:59:35 +01:00
Ben Firshman
c3c8395cef
Merge pull request #215 from marksteve/docker-0.11
...
Docker 0.11
2014-05-08 10:10:19 +01:00
Tianon Gravi
d60301edb8
Update restrict.Restrict to both show the error message when failing to mount /dev/null over /proc/kcore, and to ignore "not exists" errors while doing so (for when CONFIG_PROC_KCORE=n in the kernel)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-08 01:03:45 -06:00
Mark Steve Samson
38c008e527
Fix index error when getting ghost state of containers
2014-05-08 12:39:15 +08:00
Bryan Murphy
fdccfaf72a
move Table to a separate file and add additional unit tests
...
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com > (github: bmurphy1976)
2014-05-08 02:31:23 +00:00
Victor Vieux
81041b3ba6
Merge pull request #5671 from crosbymichael/merge_release_v0.11.1
...
Merge release v0.11.1
2014-05-07 18:51:29 -07:00
Michael Crosby
0ed9bba1ee
Change version to v0.11.1-dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 18:48:38 -07:00
Michael Crosby
093aacb740
Merge branch 'release' into merge_release_v0.11.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 18:47:47 -07:00
Michael Crosby
5f3d6b8e7f
Merge pull request #5668 from crosbymichael/bump_v0.11.1
...
Bump to version v0.11.1
2014-05-07 18:47:46 -07:00
Michael Crosby
fb99f992c0
Bump to version v0.11.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 17:29:56 -07:00
Michael Crosby
6640f46f0e
Merge branch 'master' into bump_v0.11.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 17:27:57 -07:00
Guillaume J. Charmes
ed00ba84ac
Merge pull request #5667 from bitness/typo-fix
...
Fix error name typo (ErrInvalidWorikingDirectory)
2014-05-07 16:53:08 -07:00
Guillaume J. Charmes
c7712b350a
Merge pull request #5665 from vieux/fix_auth_issue
...
Fix auth issue
2014-05-07 16:36:07 -07:00
Lars R. Damerow
d3150e0927
Fix error name typo (ErrInvalidWorikingDirectory)
...
Docker-DCO-1.1-Signed-off-by: Lars R. Damerow <lars@grandstreet.us > (github: bitness)
2014-05-07 16:28:51 -07:00
Victor Vieux
2aff119baa
Revert "refactor build job to know only configFile"
...
This reverts commit b9731bccf2 .
Conflicts:
server/server.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-07 22:59:13 +00:00
Victor Vieux
331e77f9ed
Revert "rename configFile to auth in the job"
...
This reverts commit e9c3e39743 .
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-07 22:58:09 +00:00
William Henry
7cd64f0344
Merge remote-tracking branch 'upstream/master'
2014-05-07 14:48:28 -06:00
Michael Crosby
93f5d539fe
Merge pull request #5660 from crosbymichael/merge_release_v0.11.0
...
Merge release to master v0.11.0
2014-05-07 11:42:49 -07:00
Michael Crosby
1ed63f1d16
Change version to v0.11.0-dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 11:38:02 -07:00
Michael Crosby
b68e0078c2
Merge branch 'release' into merge_release_v0.11.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 11:37:32 -07:00
Michael Crosby
57aa2f2ef4
Merge pull request #5640 from crosbymichael/bump_v0.11.0
...
Bump version to v0.11.0
2014-05-07 11:35:20 -07:00
Michael Crosby
15209c380c
Bump version to v0.11.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 09:59:55 -07:00
LK4D4
91b7d8ebd3
Change owner only on copied content
...
Fixes #5110
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-07 20:40:22 +04:00
Tianon Gravi
36d913078b
Add "Should-Start" cgroupfs-mount and cgroup-lite to sysvinit-debian init script
...
It's fine to list both here because "Should-Start" is a loose binding (ie, if the listed service exists, it'll be started first, but otherwise, this one will start without it).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-07 09:46:41 -06:00
Tianon Gravi
ddd0470ed1
Merge pull request #5642 from jmccrohan/master
...
Update mkimage-debootstrap "ubuntuLatestLTS" to "trusty"
2014-05-07 09:45:22 -06:00
Jonathan McCrohan
9e64a4d862
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)
2014-05-07 08:26:24 +01:00
Ryan Aslett
7549199cc5
The Go template is a better pattern for documentation.
2014-05-07 00:21:02 -07:00
Sven Dowideit
bd9b27fe18
Merge pull request #5634 from vieux/improve_mflag_usage
...
Add support for \n in usages
2014-05-07 13:53:04 +10:00
Victor Vieux
275faf06e8
Merge pull request #4 from SvenDowideit/improve_mflag_usage_docs
...
update the docs for the new \n rendering
2014-05-06 19:54:47 -07:00
Michael Crosby
263d134fff
Merge branch 'master' into bump_v0.11.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-06 18:03:23 -07:00
Victor Vieux
41b2874b99
Merge pull request #5643 from crosbymichael/fix-native-pid
...
Set container pid for process in native driver
2014-05-06 18:02:55 -07:00
Michael Crosby
62e8ddb579
Set container pid for process in native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-06 17:04:04 -07:00
Sven Dowideit
cfb232cff2
update the docs to reflect the nice \n handling
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-07 09:40:49 +10:00
Victor Vieux
b622da3cfe
improve some usages
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-06 21:32:12 +00:00
Victor Vieux
77098d5b5b
use tabwriter to display usage in mflag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-06 21:31:21 +00:00
Sven Dowideit
d7166536e7
Merge pull request #5622 from SvenDowideit/net-host-docs
...
Update the run --net cli help to include the 'host' option
2014-05-07 07:11:41 +10:00
Michael Crosby
5c12a27838
Merge pull request #5631 from vmarmol/cpuacct-usage
...
Export cpuacct CPU usage in total cores over the sampled period.
2014-05-06 11:47:55 -07:00
Victor Vieux
8d07c2d1ae
Fix logo in README.md
2014-05-06 11:39:11 -07:00
Vincent Batts
6f32727844
registry: adding vbatts to the MAINTAINERS
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-05-06 14:31:47 -04:00
Victor Marmol
543e60eb60
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)
2014-05-06 16:56:39 +00:00
Michael Crosby
818648ff9f
Merge pull request #5630 from rjnagal/libcontainer-fixes
...
Check supplied hostname before using it.
2014-05-06 09:49:52 -07:00
Michael Crosby
7e3a1b6521
Merge pull request #5629 from vmarmol/fix-systemd-softlimit
...
Remove support for MemoryReservation in systemd systems.
2014-05-06 09:48:33 -07:00
Michael Crosby
d16fcc628e
Merge pull request #5627 from cyphar/integration-cli-fixes
...
Fixed completely broken integration-cli tests
2014-05-06 09:35:30 -07:00
Michael Crosby
5034b658e3
Merge pull request #5626 from cyphar/networkfs-etchosts-tests
...
Fixed broken tests for pkg/networkfs/etchosts
2014-05-06 09:31:06 -07:00
Aanand Prasad
a3d8f7d113
Remove hash from gif URL
2014-05-06 17:13:56 +01:00
Victor Marmol
69d43b2674
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)
2014-05-06 15:53:38 +00:00
cyphar
924979259e
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)
2014-05-07 01:05:15 +10:00