Jessica Frazelle
6842c906c4
update go-md2man because code.google.com needs to go away
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-01 16:02:40 -08:00
Phil Estes
da0c9286a9
Merge pull request #18315 from jfrazelle/change-frozen-image-v2
...
update download-frozen-image.sh to v2 registry
2015-12-01 17:12:00 -05:00
Alexander Morozov
3962fe5d7b
Merge pull request #18343 from calavera/unify_debug_logging
...
[Carry 18260] Remove info logging from every api call.
2015-12-01 13:42:57 -08:00
Alexander Morozov
5efb37616f
Merge pull request #18308 from mountkin/delete-graphdb-later
...
fix 2 corner cases in container create cleanup and container removal
2015-12-01 13:19:59 -08:00
Jessica Frazelle
359d0c247f
update download-frozen-image.sh to v2 registry
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-01 13:16:42 -08:00
David Calavera
82323294db
Unify both debug logging middlewares.
...
We can remove one function from the stack by injecting the middleware
only when logging in enabled and the level is debug.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-01 14:33:33 -05:00
moxiegirl
f199a4bad6
Merge pull request #18341 from thaJeztah/fix-broken-link
...
docs: fix broken link to 1.7 Hub API
2015-12-01 09:46:45 -08:00
Shijiang Wei
4953ea1eae
fix 2 corner cases in container create cleanup and container removal
...
- avoid empty Names in container list API when fails to remove
a container
- avoid dead containers when fails to create a container
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-12-02 01:37:50 +08:00
Sebastiaan van Stijn
09742bcd69
docs: fix broken link to 1.7 Hub API
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-01 17:57:12 +01:00
Phil Estes
c6f1feb07b
Merge pull request #18321 from icecrime/maintainers_rework
...
MAINTAINERS file cleanup
2015-12-01 11:48:22 -05:00
Brian Goff
7b23976a83
Merge pull request #18261 from runcom/fix-shm-size
...
fix shm size handling
2015-12-01 11:47:27 -05:00
Arnaud Porterie
bd2d53af2c
Update core maintainers, remove duplicates
...
Move cpuguy83, duglin, tianon to core maintainers to reflect reality.
Remove james (duplicate for jamtur01) and add [people.jamtur01] section.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-12-01 07:56:19 -08:00
Antonio Murdaca
ef1d410b02
fix shm size handling
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-01 16:29:40 +01:00
Phil Estes
c8891158bd
Merge pull request #18310 from rhvgoyal/log-fs-creation
...
devmapper: Log start and end of filesystem creation
2015-12-01 09:49:13 -05:00
Sebastiaan van Stijn
c6a2bce919
Merge pull request #18331 from runcom/fix-typo
...
daemon: daemon_experimental.go: fix typo
2015-12-01 15:48:10 +01:00
Sebastiaan van Stijn
27bfa93b69
Merge pull request #18330 from thaJeztah/re-enable-api-v1.22
...
docs: add API v1.22 to the list again
2015-12-01 14:18:53 +01:00
Vivek Goyal
a489e685c0
devmapper: Log start and end of filesystem creation
...
ext4 filesystem creation can take a long time on 100G thin device and
systemd might time out and kill docker service. Often user is left thinking
why docker is taking so long and logs don't give any hint. Log an info
message in journal for start and end of filesystem creation. That way
a user can look at logs and figure out that filesystem creation is
taking long time.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-12-01 13:05:46 +00:00
Tibor Vass
c247b3d104
Merge pull request #18318 from calavera/fix_dns_setting_on_hostconfig_start
...
Make sure container start doesn't make the DNS fields nil.
2015-12-01 12:43:16 +01:00
Antonio Murdaca
4c8088268c
daemon: daemon_experimental.go: fix typo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-01 12:03:50 +01:00
Sebastiaan van Stijn
3ddd21b8b6
docs: add API v1.22 to the list again
...
The 1.22 API was temporarily removed in e4d86c2c38
to prevent it showing up in the 1.9 documentation.
This reverts that change and tweaks the aligning
of the table headers in Markdown source.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-01 11:59:45 +01:00
Vincent Demeester
657085dfdb
Merge pull request #18198 from aditirajagopal/16756-docker_api_inspect_test
...
Checkers on docker_api_inspect_test.go
2015-12-01 09:56:01 +01:00
David Calavera
d7117a1b71
Make sure container start doesn't make the DNS fields nil.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-30 22:46:31 -05:00
David Calavera
1ddd4b1dcc
Merge pull request #18320 from jfrazelle/add-license-selinux
...
add licence to rpm
2015-11-30 16:20:08 -08:00
Jessica Frazelle
09d448f924
add licence to rpm
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-30 15:19:31 -08:00
David Calavera
94997e56a9
Merge pull request #18211 from Djelibeybi/master
...
Updated LICENSE file
2015-11-30 14:37:29 -08:00
Aditi Rajagopal
85e5b05018
Checkers on docker_api_inspect_test.go
...
Applying #16756 to integration-cli/docker_api_inspect_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-30 16:23:46 -06:00
David Calavera
dc9f9d9445
Merge pull request #18216 from aditirajagopal/16756-docker_api_containers_test
...
Checkers on docker_api_containers_test
2015-11-30 14:04:54 -08:00
Tianon Gravi
91c653d73a
Merge pull request #18317 from jfrazelle/fix-gopath
...
fix gopath when building debs
2015-11-30 14:04:41 -08:00
Arnaud Porterie
29dbce8357
MAINTAINERS file cleanup
...
First phase in cleaning up the MAINTAINERS file to make it better
reflect reality by:
- Removing "Operators" that have no practical role.
- Removing "Subsystems" as they often are separate repositories with
their own MAINTAINERS files.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-11-30 14:00:12 -08:00
Jessica Frazelle
4935f7f500
fix gopath when building debs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-30 13:44:59 -08:00
Aditi Rajagopal
4bdf957c26
Checkers on docker_api_containers_test
...
Applying #16756 to integration-cli/docker_api_containers_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-30 14:31:48 -06:00
David Calavera
c84f5dfd74
Merge pull request #17438 from pmalmgren/17037-systemd226-cgroup
...
Fix docker status incorrectly reports containerized
2015-11-30 11:47:16 -08:00
Phil Estes
2a354790a6
Merge pull request #18241 from LK4D4/remove_listenbuffer
...
Remove listenbuffer
2015-11-30 14:37:14 -05:00
Jess Frazelle
e852959fad
Merge pull request #18178 from jfrazelle/apparmor-we-meet-again
...
Fix docker-default profile handing signals
2015-11-30 11:34:34 -08:00
David Calavera
54733abba3
Merge pull request #18148 from aditirajagopal/16756-docker_api_info_test
...
Checkers on integration-cli/docker_api_info_test
2015-11-30 11:06:15 -08:00
Alexandre Beslic
0f0cf267e8
Merge pull request #18204 from mavenugo/dhb
...
Configurable discovery ttl and heartbeat timer
2015-11-30 11:00:53 -08:00
Jessica Frazelle
f8db9a09e0
check version for docker-default aa profile
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-30 10:18:12 -08:00
David Calavera
221d979e7b
Merge pull request #18296 from jfrazelle/add-james
...
add james golick to names generator
2015-11-30 10:00:21 -08:00
Jess Frazelle
360a106511
Merge pull request #18303 from runcom/lxc-leftover
...
daemon: remove sysInitPath, lxc leftover
2015-11-30 09:37:05 -08:00
Alexander Morozov
377e1d75f9
Merge pull request #18239 from jfrazelle/17783-fix-regex
...
Fix parsing of apparmor pcre syntax
2015-11-30 09:15:25 -08:00
Alexander Morozov
a0251b2bbf
Remove listenbuffer package
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-30 09:04:59 -08:00
Alexander Morozov
ca5795cef8
Remove usage of listenbuffer package
...
It actually adds nothing to queuing requests.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-30 09:04:55 -08:00
Vincent Demeester
7bef428110
Merge pull request #18306 from runcom/add-test-suffix
...
integration-cli: add _test suffix to test file
2015-11-30 17:02:15 +01:00
Vincent Batts
a26accfb5d
Merge pull request #18226 from duglin/Issue18170
...
Fix for zero-sized layers
2015-11-30 09:57:37 -06:00
Phil Estes
f3ff09f578
Merge pull request #18272 from hqhq/hq_fix_kernel_memory
...
Fix kernel memory limit
2015-11-30 10:01:45 -05:00
Antonio Murdaca
f187bdbb9b
Merge pull request #18302 from WeiZhang555/lint-auto
...
Golint auto-generated file
2015-11-30 12:32:23 +01:00
Antonio Murdaca
1f0f41e8d7
integration-cli: add _test suffix to test file
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-30 11:33:57 +01:00
Antonio Murdaca
1b726b29b2
daemon: remove sysInitPath, lxc leftover
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-30 10:04:13 +01:00
Zhang Wei
a7b73e57bc
Golint auto-generated file
...
Fix auto-generation script to golint auto-generated files.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-30 16:34:07 +08:00
Qiang Huang
0a426c47c8
Update cgroup integration tests
...
Cgroup integtaion tests should cover:
- docker can run sucessfully with these options
- these cgroup options are set to HostConfig as expected
- these cgroup options are really set to cgroup files as expected
- other cases (wrong value, combinations etc..)
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-11-30 08:40:47 +08:00