a5283d2ff3
Merge pull request #13866 from brahmaroutu/runOOM_13766
...
RunOOM test should check to see if Oom Control is enabled
2015-07-07 16:21:46 -07:00
b2b367a6ad
Merge pull request #14427 from Evalle/14404-add-Metatag
...
Adding Group Metatag
2015-07-07 16:43:20 -06:00
f7ea9114d6
Merge pull request #14415 from calavera/warning_on_no_dev_sync
...
Put dm.override_udev_sync_check back.
2015-07-07 14:35:49 -07:00
e27131519f
Warn when udev_sync is not supported.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-07 15:10:24 -06:00
e3966c1031
Merge pull request #14380 from sunyuan3/TestRunCapAddCHOWN
...
add TestRunCapAddCHOWN test case
2015-07-07 12:36:14 -07:00
9af7afb9eb
Revert "Fix implicit DeviceMapper selection"
...
This reverts commit 0a376291b2
2015-07-07 12:27:19 -07:00
a14b1f1e9d
Merge pull request #14441 from embray/patch-1
...
Update windows.md
2015-07-07 15:14:37 -04:00
a8f8748f7a
Merge pull request #14398 from ankushagarwal/gitignore-iml
...
Removing .idea from .gitignore
2015-07-07 12:10:54 -07:00
bfc5966d0b
Merge pull request #14094 from rghv/master
...
Added entries of a few ancient Indian mathematicians who did cool things centuries ago.
2015-07-07 12:03:28 -07:00
2ea4d90da4
Merge pull request #14422 from Microsoft/10662-dumpstacks
...
Windows: Win32 event for sigusr1 linux equivalence
2015-07-07 10:54:00 -07:00
12c85f3671
Update windows.md
...
With apologies (it wasn't clear from the contributing guidelines how this project feels about PRs for one or two word doc fixes).
Signed-off-by: Erik M. Bray <erik.m.bray@gmail.com>
2015-07-07 13:51:17 -04:00
cd72c7f3bb
Merge pull request #14421 from dmcgowan/fix-duplicate-layers
...
Fix duplicate layers in manifest
2015-07-07 10:50:45 -07:00
10bbf62081
Merge pull request #14375 from coolljt0725/fix_test_events_default_empty
...
Fix test TestEventsDefaultEmpty. Fixes #14360
2015-07-07 10:37:40 -04:00
833cdd28ed
Merge pull request #14307 from kolyshkin/readme-fixes
...
README.md: fix cgroups/namespaces name and link
2015-07-07 06:09:20 -07:00
61418e39d5
Merge pull request #14428 from sunyuan3/TestPushBusyboxImage
...
Correct wrong comment of TestPushBusyboxImage.
2015-07-07 14:44:08 +02:00
f244ed2531
Correct wrong comment of TestPushBusyboxImage.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-07-07 16:10:37 +08:00
270d7e1af8
Merge pull request #14406 from duglin/tweakCmdlineHelp
...
Fix example in cmdline help text to have correct output
2015-07-07 09:26:13 +02:00
244141a8aa
Merge pull request #13987 from larsks/bug/7583
...
Update docker commit man page re: volumes
2015-07-07 09:16:54 +02:00
0db7c2a9a6
Adding Group Metatag
...
Signed-off-by: evalle <shmarnev@gmail.com>
2015-07-07 09:08:55 +02:00
81964ca555
Merge pull request #14275 from ankushagarwal/runtime-metrics-docs-stats
...
Add Docker stats to runtime metrics article
2015-07-07 08:21:31 +02:00
a25ee91f1c
Merge pull request #14095 from timwraight/master
...
Clarify .dockerignore example for Markdown files
2015-07-07 07:59:39 +02:00
68efb27e99
daemon.md: fix placement of exec driver heading
...
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
2015-07-06 22:51:31 -07:00
7e309aed4e
README.md: fix cgroups/namespaces name and link
...
The features Docker relies on are called "cgroups" and "namespaces",
so fix the language accordingly.
Also for cgroups, provide a link to Linux kernel documentation that
is more relevant (and deep) than the Wikipedia article.
Cc: Ankush Agarwal <ankushagarwal11@gmail.com>
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
2015-07-06 22:45:56 -07:00
2802831218
Fix test TestEventsDefaultEmpty. Fixes #14360
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-07-07 11:27:00 +08:00
58edd21c05
Merge pull request #14409 from vdemeester/fix-testRequires-network
...
Fix integration tests with testRequires(c, Network)
2015-07-06 23:08:34 -04:00
f4b08c7f5e
Windows: Win32 event for sigusr1 linux equivalence
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-06 18:58:53 -07:00
aea0fd0115
Fix example in cmdline help text to have correct output
...
Showing "$$ exit 13" caught my eye and wasn't correct.
While in there I also made it so the following paragraph didn't go past 80 chars
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-06 17:51:09 -07:00
35081ea4b6
Fix duplicate layers in manifest
...
Currently the layer array is initialized with the first layer then the first layer is appened to the layer list. Adding the first layer twice causes the layer to appear twice in the manifest, making a duplicate push and pull attempt occur.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-06 17:31:06 -07:00
2905fe4806
Merge pull request #14414 from jfrazelle/fix-rpms
...
fix rpms
2015-07-06 17:12:38 -07:00
6ffce0131c
Merge pull request #14154 from chrismckinnel/master
...
Fix a broken link to .dockerignore
2015-07-06 15:48:25 -07:00
274c838ced
Add Docker stats to runtime metrics article
...
Fixes #13170
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-07-06 15:40:26 -07:00
4f69609ac2
Merge pull request #14411 from duglin/Issue14407
...
Add some missing events to the API docs
2015-07-06 23:29:56 +02:00
e7fb38410d
RunOOM test should check to see if Oom Control is enabled
...
closes #13766
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-06 21:15:55 +00:00
76a853de6e
fix rpms
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-06 14:14:26 -07:00
6e4c6da819
Fix integration tests with testRequires(c, Network)
...
It seems http://hub.docker.com is not accessible anymore, so switching
to https://hub.docker.com for testRequires(c, Network).
Adds a Timeout check on the TestRequirement to *panic* if there is a
timeout (fail fast).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-06 22:08:35 +02:00
4bb3c253e8
Add some missing events to the API docs
...
Closes #14407
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-06 11:39:37 -07:00
c7492126ef
Merge pull request #14127 from vbatts/vbatts-dm-active-external
...
pkg/devicemapper: external device activation
2015-07-06 14:07:33 -04:00
b0f7a1c62c
Removing .idea from .gitignore
...
The project cannot include every editor's
ignore files. Contributers can use a local
global gitignore : https://help.github.com/articles/ignoring-files
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-07-06 10:41:38 -07:00
a974789537
Update docker commit man page re: volumes
...
Update the man page for 'docker commit' to make explicit the fact that
'commit' does not save data in volumes.
Addresses comments in #7583
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
2015-07-06 10:16:21 -04:00
26a35dd09b
Merge pull request #14344 from Mashimiao/add-json-check-for-execcreate
...
api/server: Add missing json check
2015-07-05 19:04:12 -04:00
7fde07ea16
Merge pull request #14394 from moxiegirl/carry-pr-13361
...
Carries and closes 13361
2015-07-05 11:30:17 +02:00
2c5e044b59
Carries and closes 13361
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-04 18:12:52 -07:00
7aa554c444
Merge pull request #14392 from moxiegirl/fix-fedora-table
...
Table formatting was broken
2015-07-04 16:30:17 -07:00
57286aad25
Merge pull request #14235 from mlarcher/mlarcher-patch-2
...
Add workaround in docs for git bash usage issue
2015-07-04 21:00:53 +02:00
f240bb5e94
Merge pull request #14309 from Tenk42/14287-wheezy-link-broken-on-debian-page
...
Fixing Wheezy link on debian installation page
2015-07-04 14:57:00 -04:00
762214ccc8
Table formatting was broken
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-04 07:32:58 -07:00
36958ba49b
Merge pull request #14374 from Mashimiao/clinent-load-tiny-typo-fix
...
client/load: tiny typo fix
2015-07-04 00:24:21 +02:00
90bc5513a9
Merge pull request #14383 from runcom/runconfig-merge-cleanup
...
add break after key is found in for loop
2015-07-03 15:18:09 -07:00
a5be803458
Add break after key is found in for loop
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-03 20:37:34 +02:00
bca32648f4
Merge pull request #14195 from ch3lo/master
...
update in Kitematic OS support
2015-07-03 18:05:27 +02:00
Michael Crosby
David Calavera
Arnaud Porterie
James Turnbull
Erik Bray
Brian Goff
moxiegirl
Antonio Murdaca
Yuan Sun
Sebastiaan van Stijn
evalle
Kir Kolyshkin
Lei Jitang
Doug Davis
John Howard
Doug Davis
Derek McGowan
Ankush Agarwal
root
Jessica Frazelle
Vincent Demeester
Vincent Batts
Lars Kellogg-Stedman
Alexander Morozov
Antonio Murdaca