ef8d6cbdf1
Last step in removing engine.Tabel from api/client/*
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 065648a8324a0df5d5d05b3df223e6b058260425
Component: engine
2015-04-06 10:55:53 -07:00
ac2db88b40
Merge pull request #12063 from icecrime/update_maintainers
...
Several updates to MAINTAINERS file
Upstream-commit: 2a79d54f4c62165ee348adf98297950e886f1d4b
Component: engine
2015-04-03 17:20:20 -07:00
fbb577a9e7
Merge pull request #12069 from whoshuu/notice-link
...
Make NOTICE in the README into a link
Upstream-commit: a45375f1f95d14dac9c065e3aa79d0949e68fe14
Component: engine
2015-04-03 17:08:53 -07:00
3099776db6
Add thaJeztah
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 886026f99e4b13b0fa2ee4c5582786a863e1d0d1
Component: engine
2015-04-03 16:37:36 -07:00
c96dd46bbb
Make NOTICE in the README into a link
...
Signed-off-by: Huu Nguyen <whoshuu@gmail.com >
Upstream-commit: d94e186442ef4ba3103a6ad72666782179d3c2b8
Component: engine
2015-04-03 16:36:49 -07:00
38bbd48daa
Merge pull request #12065 from proppy/patch-14
...
test-unit: fix TESTFLAGS doc
Upstream-commit: 6a99c2032eeed5b3a308f6fc30e9242ef36d6db0
Component: engine
2015-04-03 16:26:11 -06:00
6db76a476b
test-unit: fix TESTFLAGS doc
...
Signed-off-by: Johan Euphrosine <proppy@google.com >
Upstream-commit: 5846914f91f16c9d940701c9bbc0ebb8ab3c4226
Component: engine
2015-04-03 15:05:14 -07:00
64ee249cb8
Rename status labels
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 58f07c9d8aa9b54f74af141d74314b607e2c18c5
Component: engine
2015-04-03 14:33:16 -07:00
b00d56f4e3
Sort maintainers alphabetically
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 80f3085651717f2f487ae41633490db59716cc04
Component: engine
2015-04-03 14:33:16 -07:00
fcb663dbcb
Move docs approval section
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 370cef012e81f11a87fcf7f1384dbbca6cab0c6c
Component: engine
2015-04-03 14:33:16 -07:00
8973909f13
Merge pull request #12060 from duglin/RemoveTable3
...
Remove engine.Table from docker search and fix missing field
Upstream-commit: b2fbd9e632191e6d6494b7dfd4dc0798e1fa47c7
Component: engine
2015-04-03 21:29:36 +00:00
d1ddfb9a9a
Merge pull request #11886 from jamiehannaford/pkg-mnt-docs
...
Document exported functions and consts in pkg/mount
Upstream-commit: 9cdad8a26b4af14680c4bcb25feea854536a323b
Component: engine
2015-04-03 21:28:11 +00:00
1b8721e96e
Merge pull request #11994 from unclejack/jsonfilelog_allocations
...
daemon/logger/jsonfilelog: avoid some allocations
Upstream-commit: 5c83dfe670373135a4f38e926a6f1d19ed23cf69
Component: engine
2015-04-03 13:58:13 -07:00
dd79c80fbf
Merge pull request #12039 from ahmetalpbalkan/windows-install-docs-update
...
docs: Add new windows installation tutorials
Upstream-commit: 4d571257edf628a42e54885befc63a7374aab3be
Component: engine
2015-04-03 20:39:21 +00:00
02c373c0f8
Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter
...
docs: fix bullet list and missing label filter
Upstream-commit: fb1e10284bb04b29c21357675374fdd27a8ff3e4
Component: engine
2015-04-03 12:33:22 -07:00
d54d64d3e2
Merge pull request #12003 from sleinen/patch-1
...
Make explanation consistent with command
Upstream-commit: a6c04f33e141527b24dc373a68ed62e2201803a0
Component: engine
2015-04-03 12:19:37 -07:00
f8af71c0cf
Merge pull request #12057 from icecrime/11925_carry
...
Specify running `boot2docker ip` on host
Upstream-commit: 6d5a0ac11ea50cd46d6f04435e49bb1b08bd0d60
Component: engine
2015-04-03 12:11:53 -07:00
e471adcfbf
Merge pull request #12048 from tianon/auto-btrfs_noversion
...
Change the btrfs_noversion check to be automatic
Upstream-commit: 409ed98c3f95f90311127773baa78904ac8350b6
Component: engine
2015-04-03 19:00:57 +00:00
bf961698dc
Merge pull request #12054 from eluck/master
...
Update userguide/dockervolumes - fixes issue #12052
Upstream-commit: 3985dc299a5958481a9c0dcbd3bc7da69de6a19b
Component: engine
2015-04-03 18:58:52 +00:00
bd5aac3934
Merge pull request #12037 from twhiteman/master
...
integration-cli: in TestPsListContainersSize, check for no containers
Upstream-commit: 3683498d6fe233f9f68fb5a6186158293b450049
Component: engine
2015-04-03 18:52:26 +00:00
ef9deeddf0
Merge pull request #12059 from whoshuu/readme
...
Clean up formatting in the README
Upstream-commit: 55da2e59870b62eb2ee1830f0f67e0711494bb03
Component: engine
2015-04-03 18:49:26 +00:00
4514e9e241
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 >
Upstream-commit: 2b320a230979c3222162567b9d1d3193b0806cd5
Component: engine
2015-04-03 11:33:34 -07:00
938f87c2dd
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 >
Upstream-commit: 67b4cce0f6c835cf9e53313a026af2e825ba8b10
Component: engine
2015-04-03 11:27:30 -07:00
dd7175bcb6
Merge pull request #12010 from ibuildthecloud/small
...
Small changes from #11967 for review comments
Upstream-commit: e64f6baf116771b22a3050cf686624dbb6b19f37
Component: engine
2015-04-03 11:27:06 -07:00
513240409b
Merge pull request #11981 from unclejack/fix_profiler
...
api/server: fix profiler HTTP serving
Upstream-commit: b3e9c274ddadde302d927a866c8704be77c871e0
Component: engine
2015-04-03 18:25:12 +00:00
c121c9b8d9
Merge pull request #12058 from duglin/RemoveTable2
...
Remove engine.Table from docker history and docker rmi
Upstream-commit: 326a5545d43b63c1f806c3106be884c06facd77b
Component: engine
2015-04-03 10:57:52 -07:00
007282bfc1
Merge pull request #12017 from moxiegirl/distribution-man-pages
...
Updating with man pages for distribution
Upstream-commit: 12e77875407f4a4368f198d28d1fadc2c676401c
Component: engine
2015-04-03 09:55:08 -07:00
d13d80f01b
Clean up formatting in the README
...
Signed-off-by: Huu Nguyen <whoshuu@gmail.com >
Upstream-commit: bfddad18ce126e1a500ffb968f4ff4a9f2683824
Component: engine
2015-04-03 09:50:35 -07:00
b13c0e5f0a
Merge pull request #11860 from maximkulkin/11575-dockerize-image-tool
...
Add tool to conver disk image into Docker image
Upstream-commit: 61933395ebdf0c8c54012b6b75312da595183c54
Component: engine
2015-04-03 09:32:11 -07:00
57ace4f0d5
Merge pull request #11881 from jrjang/master
...
mkimage-arch: set default C.UTF-8 locale
Upstream-commit: c8ca904f15b1649ec536c6b9660b4a2247a8c4ce
Component: engine
2015-04-03 09:28:11 -07:00
8827ee42d2
Specify running boot2docker ip on host
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: bcbdf77ddb7dab0bf6346400eeb6a0aaaf3d7142
Component: engine
2015-04-03 08:53:44 -07:00
579d436a86
Merge pull request #11956 from coolljt0725/add_memcg_swap_cgroup_enabled_to_check_config
...
add MEMCG_SWAP_ENABLED to check-config.sh
Upstream-commit: 03525d5fc647f4686728f3c6f3acf514433e07cb
Component: engine
2015-04-03 08:50:54 -07:00
6eb83f4ef3
Merge pull request #12018 from sunyuan3/search
...
If docker search with --starts=${negative number}, it would show the war...
Upstream-commit: 2c5da7d1accdc9a2be321602285946bbe29593c2
Component: engine
2015-04-03 11:38:38 -04:00
3a500e0f89
Remove engine.Table from docker history and docker rmi
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0b2fa9c707ab06836cf5dd7b3ca9efac64bba925
Component: engine
2015-04-03 08:31:30 -07:00
74b9d04473
Merge pull request #11997 from tiborvass/carry-11926
...
Carry 11926: Added information about accessing host directory on Windows.
Upstream-commit: 05753288c462b603d7979d2febf66bca7aa6741a
Component: engine
2015-04-03 06:43:38 -07:00
77e454c28a
Merge pull request #11775 from maximkulkin/explain-advanced-contribution-workflow
...
Explain advanced contribution workflow more
Upstream-commit: da61228501acf24e651e167efb7b3c25c6bf5548
Component: engine
2015-04-03 06:41:49 -07:00
e2ab7dec3a
Update userguide/dockervolumes - fixes issue #12052
...
Signed-off-by: Evgeny Lukianchikov <mail@eluck.me >
Upstream-commit: 57b09068efe3a278145683ff05b5e352ee00bba3
Component: engine
2015-04-03 14:07:51 +03:00
5361796b1a
Add documentation for exported functions and types
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
Upstream-commit: 9a98556c2bc355170893568ca20e102cbda7d600
Component: engine
2015-04-03 11:33:34 +02:00
3274cd15bf
Change the btrfs_noversion check to be automatic
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 3761955e8c1e7534026c469186c3f66c18e77cbc
Component: engine
2015-04-03 01:30:12 -06:00
d2894c5f4b
Merge pull request #11883 from coolljt0725/add_missing_option_to_bash_completion
...
Add some missing option to bash completion
Upstream-commit: a3a45a6ec0278ac37eee7cebe57e728b2cd2165c
Component: engine
2015-04-02 22:49:58 -07:00
231f4b47fb
Merge pull request #12043 from joeygibson/12041-fix-vet-warnings
...
Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
Upstream-commit: 4e90b47cc23a4a90063918bbc69799333d8bafde
Component: engine
2015-04-02 22:07:55 -07:00
3b7f375359
Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
...
Signed-off-by: Joey Gibson <joey@joeygibson.com >
Upstream-commit: a9443de7c5759398804acaa3fd9ccfb196557cfe
Component: engine
2015-04-03 00:18:21 -04:00
8c6dabaae6
If docker search with --starts=${negative number}, it would show the warning.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 87e0e4eb431693cf1eeed777c6c4648ae0a94395
Component: engine
2015-04-03 08:55:34 +08:00
7156a27c06
Merge pull request #11995 from icecrime/test_daemon_stop
...
Properly stop test daemon in integration-cli
Upstream-commit: f92e88b7e0bb782badbd45d95a4013c7f1ddbb19
Component: engine
2015-04-02 20:27:20 -04:00
e0fc0cdcdd
Merge pull request #12040 from duglin/TableFromDiff
...
Remove use of Table from 'docker diff'
Upstream-commit: 3f1590f6797a30dfd30010d6d2e1567ff6d53729
Component: engine
2015-04-02 17:21:40 -07:00
68cf0c513e
Remove use of Table from 'docker diff'
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 49c72506ace177e33d867123ca15f193c38bcf45
Component: engine
2015-04-02 16:55:58 -07:00
efa6b62065
Merge pull request #11571 from noironetworks/11555-Docker-since-beginning-of-unix-time-doesnt-work
...
Fixes docker events since beginning of unix time
Upstream-commit: 9c505c906d318df7b5e8652c37e4df06b4f30d56
Component: engine
2015-04-02 15:03:04 -07:00
c5aa7a43a1
Merge pull request #12036 from crosbymichael/update-libcontainer-apr2
...
Update libcontainaer to d00b8369852285d6a830a8d3b9
Upstream-commit: 962ded2deebaa9f4a0d8f7a8223ae099fbb5c7e1
Component: engine
2015-04-02 14:46:44 -07:00
c1f9e7351f
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 >
Upstream-commit: 3e51a8147510fb59d6206fe7310feaebc2d69fbc
Component: engine
2015-04-02 14:45:52 -07:00
54f3509eb1
Update libcontainaer to d00b8369852285d6a830a8d3b9
...
Fixes #12015
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: d12fef1515cb3f0938ea6ed8cab8351e2df2753e
Component: engine
2015-04-02 14:12:55 -07:00
