guoxiuyan
ffcc4a1e52
Fix a minor typo
...
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com>
2015-04-04 15:36:35 +08:00
Michael Crosby
2a79d54f4c
Merge pull request #12063 from icecrime/update_maintainers
...
Several updates to MAINTAINERS file
2015-04-03 17:20:20 -07:00
Arnaud Porterie
a45375f1f9
Merge pull request #12069 from whoshuu/notice-link
...
Make NOTICE in the README into a link
2015-04-03 17:08:53 -07:00
Arnaud Porterie
886026f99e
Add thaJeztah
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-03 16:37:36 -07:00
Huu Nguyen
d94e186442
Make NOTICE in the README into a link
...
Signed-off-by: Huu Nguyen <whoshuu@gmail.com>
2015-04-03 16:36:49 -07:00
Tianon Gravi
6a99c2032e
Merge pull request #12065 from proppy/patch-14
...
test-unit: fix TESTFLAGS doc
2015-04-03 16:26:11 -06:00
Johan Euphrosine
5846914f91
test-unit: fix TESTFLAGS doc
...
Signed-off-by: Johan Euphrosine <proppy@google.com>
2015-04-03 15:05:14 -07:00
Arnaud Porterie
58f07c9d8a
Rename status labels
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-03 14:33:16 -07:00
Arnaud Porterie
80f3085651
Sort maintainers alphabetically
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-03 14:33:16 -07:00
Arnaud Porterie
370cef012e
Move docs approval section
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-03 14:33:16 -07:00
Jessie Frazelle
b2fbd9e632
Merge pull request #12060 from duglin/RemoveTable3
...
Remove engine.Table from docker search and fix missing field
2015-04-03 21:29:36 +00:00
Jessie Frazelle
9cdad8a26b
Merge pull request #11886 from jamiehannaford/pkg-mnt-docs
...
Document exported functions and consts in pkg/mount
2015-04-03 21:28:11 +00:00
Alexander Morozov
5c83dfe670
Merge pull request #11994 from unclejack/jsonfilelog_allocations
...
daemon/logger/jsonfilelog: avoid some allocations
2015-04-03 13:58:13 -07:00
Jessie Frazelle
4d571257ed
Merge pull request #12039 from ahmetalpbalkan/windows-install-docs-update
...
docs: Add new windows installation tutorials
2015-04-03 20:39:21 +00:00
moxiegirl
fb1e10284b
Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter
...
docs: fix bullet list and missing label filter
2015-04-03 12:33:22 -07:00
moxiegirl
a6c04f33e1
Merge pull request #12003 from sleinen/patch-1
...
Make explanation consistent with command
2015-04-03 12:19:37 -07:00
moxiegirl
6d5a0ac11e
Merge pull request #12057 from icecrime/11925_carry
...
Specify running `boot2docker ip` on host
2015-04-03 12:11:53 -07:00
Jessie Frazelle
409ed98c3f
Merge pull request #12048 from tianon/auto-btrfs_noversion
...
Change the btrfs_noversion check to be automatic
2015-04-03 19:00:57 +00:00
Jessie Frazelle
3985dc299a
Merge pull request #12054 from eluck/master
...
Update userguide/dockervolumes - fixes issue #12052
2015-04-03 18:58:52 +00:00
Jessie Frazelle
3683498d6f
Merge pull request #12037 from twhiteman/master
...
integration-cli: in TestPsListContainersSize, check for no containers
2015-04-03 18:52:26 +00:00
Jessie Frazelle
55da2e5987
Merge pull request #12059 from whoshuu/readme
...
Clean up formatting in the README
2015-04-03 18:49:26 +00:00
Ahmet Alp Balkan
2b320a2309
docs: Add new windows installation tutorials
...
Updated Windows installation documentation with newest
screencasts and Chocolatey instructions to install windows
client CLI.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-03 11:33:34 -07:00
Doug Davis
67b4cce0f6
Remove engine.Table from docker search and fix missing field
...
registry/SearchResults was missing the "is_automated" field.
I added it back in.
Pull this 'table' removal one from the others because it fixed
a bug too
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-03 11:27:30 -07:00
Michael Crosby
e64f6baf11
Merge pull request #12010 from ibuildthecloud/small
...
Small changes from #11967 for review comments
2015-04-03 11:27:06 -07:00
Jessie Frazelle
b3e9c274dd
Merge pull request #11981 from unclejack/fix_profiler
...
api/server: fix profiler HTTP serving
2015-04-03 18:25:12 +00:00
Michael Crosby
326a5545d4
Merge pull request #12058 from duglin/RemoveTable2
...
Remove engine.Table from docker history and docker rmi
2015-04-03 10:57:52 -07:00
moxiegirl
12e7787540
Merge pull request #12017 from moxiegirl/distribution-man-pages
...
Updating with man pages for distribution
2015-04-03 09:55:08 -07:00
Huu Nguyen
bfddad18ce
Clean up formatting in the README
...
Signed-off-by: Huu Nguyen <whoshuu@gmail.com>
2015-04-03 09:50:35 -07:00
Arnaud Porterie
61933395eb
Merge pull request #11860 from maximkulkin/11575-dockerize-image-tool
...
Add tool to conver disk image into Docker image
2015-04-03 09:32:11 -07:00
Arnaud Porterie
c8ca904f15
Merge pull request #11881 from jrjang/master
...
mkimage-arch: set default C.UTF-8 locale
2015-04-03 09:28:11 -07:00
Arnaud Porterie
bcbdf77ddb
Specify running boot2docker ip on host
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-03 08:53:44 -07:00
Alexander Morozov
03525d5fc6
Merge pull request #11956 from coolljt0725/add_memcg_swap_cgroup_enabled_to_check_config
...
add MEMCG_SWAP_ENABLED to check-config.sh
2015-04-03 08:50:54 -07:00
Doug Davis
2c5da7d1ac
Merge pull request #12018 from sunyuan3/search
...
If docker search with --starts=${negative number}, it would show the war...
2015-04-03 11:38:38 -04:00
Doug Davis
0b2fa9c707
Remove engine.Table from docker history and docker rmi
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-03 08:31:30 -07:00
moxiegirl
05753288c4
Merge pull request #11997 from tiborvass/carry-11926
...
Carry 11926: Added information about accessing host directory on Windows.
2015-04-03 06:43:38 -07:00
moxiegirl
da61228501
Merge pull request #11775 from maximkulkin/explain-advanced-contribution-workflow
...
Explain advanced contribution workflow more
2015-04-03 06:41:49 -07:00
eluck
57b09068ef
Update userguide/dockervolumes - fixes issue #12052
...
Signed-off-by: Evgeny Lukianchikov <mail@eluck.me>
2015-04-03 14:07:51 +03:00
Jamie Hannaford
9a98556c2b
Add documentation for exported functions and types
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
2015-04-03 11:33:34 +02:00
Tianon Gravi
3761955e8c
Change the btrfs_noversion check to be automatic
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-04-03 01:30:12 -06:00
Arnaud Porterie
a3a45a6ec0
Merge pull request #11883 from coolljt0725/add_missing_option_to_bash_completion
...
Add some missing option to bash completion
2015-04-02 22:49:58 -07:00
Alexander Morozov
4e90b47cc2
Merge pull request #12043 from joeygibson/12041-fix-vet-warnings
...
Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
2015-04-02 22:07:55 -07:00
Joey Gibson
a9443de7c5
Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
...
Signed-off-by: Joey Gibson <joey@joeygibson.com>
2015-04-03 00:18:21 -04:00
Yuan Sun
87e0e4eb43
If docker search with --starts=${negative number}, it would show the warning.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-03 08:55:34 +08:00
Tibor Vass
f92e88b7e0
Merge pull request #11995 from icecrime/test_daemon_stop
...
Properly stop test daemon in integration-cli
2015-04-02 20:27:20 -04:00
Phil Estes
3f1590f679
Merge pull request #12040 from duglin/TableFromDiff
...
Remove use of Table from 'docker diff'
2015-04-02 17:21:40 -07:00
Doug Davis
49c72506ac
Remove use of Table from 'docker diff'
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-02 16:55:58 -07:00
Arnaud Porterie
9c505c906d
Merge pull request #11571 from noironetworks/11555-Docker-since-beginning-of-unix-time-doesnt-work
...
Fixes docker events since beginning of unix time
2015-04-02 15:03:04 -07:00
Jessie Frazelle
962ded2dee
Merge pull request #12036 from crosbymichael/update-libcontainer-apr2
...
Update libcontainaer to d00b8369852285d6a830a8d3b9
2015-04-02 14:46:44 -07:00
Todd Whiteman
3e51a81475
integration-cli: add check for TestPsListContainersSize when no containers are returned
...
* when no containers are returned, go test would then aborts with:
panic: runtime error: index out of range
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
2015-04-02 14:45:52 -07:00
Michael Crosby
d12fef1515
Update libcontainaer to d00b8369852285d6a830a8d3b9
...
Fixes #12015
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-04-02 14:12:55 -07:00
