91ec6d65ce
Merge pull request #5502 from tianon/remove-contrib-zfs
...
Remove contrib/zfs directory
Upstream-commit: f5e5777e6359378261b176708dfe4f1853f93814
Component: engine
2014-04-30 11:03:13 -07:00
5ce64c0f94
Remove contrib/zfs directory
...
A WIP pull request or issue for discussion would be a better avenue for collaboration and discussion of a ZFS backend.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 0037dc8d60bc22e34838e15efaa1041ea2826c2c
Component: engine
2014-04-30 11:56:14 -06:00
b9c2a63b00
Merge pull request #5500 from tianon/fix-maintainers-format
...
Fix various MAINTAINERS format inconsistencies
Upstream-commit: e8f8f1c72963e1c9511ea6aedcd8a1f53c5da277
Component: engine
2014-04-30 10:55:45 -07:00
bde45636d6
Fix various MAINTAINERS format inconsistencies
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: defecac2799ca0c72532b7e6ed6005cc54ee2e25
Component: engine
2014-04-30 11:22:11 -06:00
c760729220
Merge branch 'pr-5353'
...
Upstream-commit: 0c5375146a6881d3a093523c2422b29679387743
Component: engine
2014-04-30 02:10:53 -07:00
23a6b19cdc
beam: Add more tests to unix_test.go
...
These are failing, and indicate things that need to be fixed. The
primarily problem is the lack of framing between beam messages.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
[solomon@docker.com: rebased on master]
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: e802b69146ac7a008d943a3a289fba56150b4f81
Component: engine
2014-04-30 02:10:09 -07:00
bbcaf9ab18
Add new test-unit make rule which only runs the unit tests. Renames test
...
bundle to test-unit.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: 494c789ac34d3f22d5f6275937155e0aa2647374
Component: engine
2014-04-30 02:10:09 -07:00
25c14cce30
for want of a comma, the kingdom was lost
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 9e2e26c69a52c0b55d31de477a652731f87b4558
Component: engine
2014-04-30 02:10:09 -07:00
659a79c68f
Merge pull request #5484 from vmarmol/add-test-unit
...
Add new test-unit make rule which only runs the unit tests
Upstream-commit: 70b56529847cf0c1fa58e5060c2a471701801f98
Component: engine
2014-04-29 23:15:16 -06:00
daed0fd4e2
Merge pull request #5487 from SvenDowideit/docs-fix-invalid-json
...
for want of a comma, the kingdom was lost
Upstream-commit: 48388b81787dcae4ce13dc75277c3209bbb258a1
Component: engine
2014-04-29 22:28:59 -04:00
760aa19df4
Merge pull request #5320 from JackDanger/jackdanger/typo-doc-fix
...
Upstream-commit: 20e9f61971a858baef1c8035f5f08ceefdc7c92d
Component: engine
2014-04-29 17:41:16 -07:00
6630e05dd5
for want of a comma, the kingdom was lost
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: ebaff50bd2c94f2353f4bd738e077c7baef3e879
Component: engine
2014-04-30 10:12:21 +10:00
79d31745eb
Add new test-unit make rule which only runs the unit tests. Renames test
...
bundle to test-unit.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: a39f3c9200d574c12b88fb91654f1242ec07b7b5
Component: engine
2014-04-29 23:26:27 +00:00
55792f63be
Merge pull request #5477 from vmarmol/add-testdirs
...
Add a TESTDIRS variable to the test bundle to control which directories are unit tested
Upstream-commit: a96cac4d7d42db757f9387ff1352ebedfc7b557e
Component: engine
2014-04-29 16:40:40 -06:00
1c4e288ba8
Merge pull request #5440 from ostezer/docs-improve-code-block-rendering
...
Docs/CSS: Amend code block rendering.
Upstream-commit: 34a3d41d17a3f7090680b2f240a540c40184c573
Component: engine
2014-04-30 00:45:04 +03:00
4478918ea3
Merge pull request #5460 from tianon/no-pull-scratch
...
Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)
Upstream-commit: 2c85468753509c442a675d79de0e65476468c453
Component: engine
2014-04-29 14:37:06 -07:00
f3278d6d2b
Merge pull request #5478 from amangoel/patch-1
...
Update working-with-docker.md
Upstream-commit: 473b7a6c93c37506583169c4476ea341f0d96507
Component: engine
2014-04-30 00:00:14 +03:00
f54d99728b
Add a TESTDIRS variable to the test bundle to allow for the running of a
...
single go directory worth of tests.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: 6e05c420c9b7e4660b391643be21720d6f80e18d
Component: engine
2014-04-29 20:55:04 +00:00
dd5d56fcd2
Update working-with-docker.md
...
Upstream-commit: 83a5f2a192f4c8bb87e9cbd80df42a0496615a1a
Component: engine
2014-04-29 13:49:36 -07:00
f36305e10a
Merge pull request #5475 from srijs/patch-1
...
docs: DisableNetwork -> NetworkDisabled
Upstream-commit: 1bc0f82406692655cfeb6467ebf24328e2d17603
Component: engine
2014-04-29 23:43:28 +03:00
fdcad5e0a4
Merge pull request #5476 from rjnagal/libcontainer-fixes
...
Cleanup cgroups on Set failures
Upstream-commit: bf59e6723274c6d20d7c78c683b5c8923a6d910e
Component: engine
2014-04-29 12:27:31 -07:00
20591f6a0e
docs: DisableNetwork -> NetworkDisabled
...
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
Upstream-commit: 9651ff46bfc19b815e3f78bc5d6895a352db2d37
Component: engine
2014-04-29 21:18:26 +02:00
64742bd4a0
Merge pull request #5474 from crosbymichael/use-proper-scheme
...
Use proper scheme with static registry
Upstream-commit: 9d4771760af5326a2fff2e0bc091743331753253
Component: engine
2014-04-29 12:04:49 -07:00
3267a2a3bd
Cleanup existing controllers when cleanup fails mid-way.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
Upstream-commit: 070747a21365959d3179d8df627d3e614318e202
Component: engine
2014-04-29 18:59:20 +00:00
119b7b20d7
Merge pull request #4607 from vbatts/vbatts-static_registry
...
static registry support
Upstream-commit: 8a5060dba47ef9d91470c16e8ec3a9db59e60695
Component: engine
2014-04-29 11:22:44 -07:00
096d11e72f
Merge pull request #5458 from SvenDowideit/add-redirects-for-docker-io-pr-5414
...
add redirects from index/ -> docker-io/ and for the docker-io_api too
Upstream-commit: 797a4151a04ae5b3ad8aae6ed09a376e5c68108f
Component: engine
2014-04-29 12:37:22 +03:00
2b9bc2685b
Use proper scheme with static registry
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 44d54ba0c299540efbfa173bf484d541e857f4ac
Component: engine
2014-04-29 02:01:07 -07:00
8ec9474b1f
Merge pull request #5433 from SvenDowideit/remove-sphinx-validation-from-build
...
Remove Travis Sphinx validation
Upstream-commit: 83999e70f412adcb62cdefecaaaf4d2b680011e5
Component: engine
2014-04-28 22:59:53 -06:00
77a792666f
Merge pull request #5459 from shykes/remove-bootcamp
...
Remove obsolete 'bootcamp' project.
Upstream-commit: a7f21570b6467ed4d6e5ba8ce104975b8d3a95c5
Component: engine
2014-04-28 22:59:20 -06:00
cc76f7eafc
Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)
...
Creating the "docker save" tarball for "scratch" is pretty simple. I've also extrapolated the "docker build -t busybox ." logic into a separate "hack/make/.ensure-busybox" file so that it can eventually be reused easier.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: c8381d672226dd17f2e17f9cf9378f06d533911c
Component: engine
2014-04-28 22:26:25 -06:00
1e62c9c969
Remove obsolete 'bootcamp' project.
...
It was a nice idea to recruit more maintainers but we never found the
time to do it properly...
I am still interested in any ideas to make it easier to start
contributing!
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 46492ee65a26c8b3a138f4b9f5eea0e648dc8b45
Component: engine
2014-04-28 21:25:26 -07:00
bf6a9b5906
Update some whitespace in hack/make/test-integration-cli for consistency
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: e4114e6b946dfc0f433fa0f6a9de42f80656ce08
Component: engine
2014-04-28 22:22:31 -06:00
c4b74db06d
remove the sphinx validation - we'll add a MarkDown one when we have it
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 17fbe3de381c70ef852f8d1c50128299615d1ebe
Component: engine
2014-04-29 13:43:13 +10:00
0b00adc06d
Merge pull request #5438 from ostezer/docs-expand-viewport
...
Docs/CSS fix: Allow viewport expand to user's preference
Upstream-commit: 53c35412f9d6aef954cb5babccd5feca942a0939
Component: engine
2014-04-29 13:35:10 +10:00
92323936f8
add redirects from index/ -> docker-io/ and for the docker-io_api too
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 33f36177e9648b182415a7928d3b4b5dc9d0265e
Component: engine
2014-04-29 13:33:22 +10:00
7e080a1c66
Merge pull request #5414 from jamtur01/privreg
...
Addressed regression of private repository documentation.
Upstream-commit: 6c4e5ee826e1ae08674ef6e517c77583796a844b
Component: engine
2014-04-29 13:28:21 +10:00
07b4141319
Merge pull request #5439 from ostezer/docs-mkdocs-theme-maintainer-update
...
Docs/theme/MAINTAINERS: Modify/Update list of MAINTAINERS
Upstream-commit: 81d6c0f106b77ad135c2ab53691820c3239870fd
Component: engine
2014-04-28 23:12:10 -04:00
5c01798cb2
Merge pull request #5441 from ostezer/docs-fix-notes-warnings-bg
...
Docs/CSS: Fix Notes/Warnings blocks' BG colour to improve its state.
Upstream-commit: 548cadd0a22d4dfc6fa3ab91cb6c6dbddbc2d07f
Component: engine
2014-04-28 23:09:13 -04:00
a8606685cc
Merge pull request #5443 from ncdc/commit-api-doc-fix
...
Docs fix: correct /commit info
Upstream-commit: 6b5fd2daf7e16248258c10f394f33ceab0176e94
Component: engine
2014-04-28 23:09:04 -04:00
d43500e59b
Merge pull request #5455 from rjnagal/cgroup-stats
...
Add throttling stats for cpu cgroup
Upstream-commit: 69d56acd455de019cb324c4607c629be8d6fcad5
Component: engine
2014-04-28 17:53:37 -07:00
f2e5f328eb
Another test to check for invalid stats.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
Upstream-commit: d724242297bf2981ad9c7745e5b130ab7fa8f067
Component: engine
2014-04-29 00:32:05 +00:00
88a94167aa
Merge pull request #5389 from tiborvass/5152-symlink-in-volume
...
Fixes #5152 : symlink in volume path
Upstream-commit: 934bd155653b490673a58e51ccb71ffc2f66e136
Component: engine
2014-04-28 17:27:18 -07:00
28c69597af
Add cpu throttling stats.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
Upstream-commit: 61f156d5215b2c9d38e26bbd732c6e9cb9a3208e
Component: engine
2014-04-29 00:18:18 +00:00
17ade954e5
Merge pull request #5450 from tianon/update-deb-cgroup-dep
...
Update the "cgroup-lite" dep in our deb package from "Suggests" to "Recommends" and add "cgroupfs-mount" as another alternative
Upstream-commit: 093248840263a86955893c9d3e0710727f254897
Component: engine
2014-04-28 17:49:36 -06:00
efc42748f5
Merge pull request #5451 from vmarmol/add-memory-stats
...
Adding a unit test for stats in pkg/cgroup/fs/memory.go
Upstream-commit: 5b3f7851d89be189c8daf2fa02d6bc39317c466a
Component: engine
2014-04-28 16:38:34 -07:00
b3f05f4dd1
Merge pull request #5449 from tianon/remove-libcontainer-root-special-case
...
Remove "root" and "" special cases in libcontainer
Upstream-commit: eb6a1c9f499b5e0abbc1f5e040d69f1802deeb2f
Component: engine
2014-04-28 16:29:08 -07:00
d77803d819
Merge pull request #5392 from rjnagal/libcontainer-fixes
...
Minor libcontainer fixes
Upstream-commit: fbc7a069f26b76c87b305efd3d71a9d46199f77c
Component: engine
2014-04-28 16:26:17 -07:00
04e53d0381
Update the "cgroup-lite" dep in our deb package from "Suggests" to "Recommends" and add "cgroupfs-mount" as another alternative
...
I tested to verify that if neither package is available (for example, on Debian Wheezy), apt still continues installing properly.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 314818e7ba4c675b63caaaabadcfd12d10c4f3a6
Component: engine
2014-04-28 17:08:03 -06:00
7fb7f768a7
Merge branch 'master' into libcontainer-fixes
...
Conflicts:
pkg/libcontainer/README.md
pkg/libcontainer/container.json
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
Upstream-commit: c44c51e3ce1680ec2a74fc62f246490f61d7590c
Component: engine
2014-04-28 23:04:04 +00:00
f9852087ba
Adding a unit test for pkg/cgroup/fs/memory.go
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: 76f95294a316c1b545abe1fd17536da74779490b
Component: engine
2014-04-28 22:58:25 +00:00
