Victor Vieux
b27d405dd7
Merge pull request #553 from noxiouz/reduce_complexity_of_pick
...
[Random] Pick a node for O(1), not for O(n)
2015-04-01 15:26:10 -07:00
Alexander Morozov
2c0ee48224
Merge pull request #12006 from icecrime/add_kitematic_to_readme
...
Add Kitematic to README.md
2015-04-01 14:41:41 -07:00
Arnaud Porterie
7bd250c74d
Add Kitematic to README.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-01 14:38:49 -07:00
Nick Irvine
1a4d2a5c8b
Add some new graphics for installation and understanding docs
...
Fixes : #11552
- scalable SVG
- uses colours from the rest of the page
- emphasizes that boot2docker is the ordinary Linux setup in a VM
- Add new graphic for architecture diagram
- Add windows boot2docker diagram
- Add windows diagram to documentation
- Remove old PNGs; replaced with SVGs
- Add redirects for new SVG versions of installation diagrams
Signed-off-by: Nick Irvine <nfirvine@nfirvine.com >
2015-04-01 14:24:53 -07:00
Anton Tiurin
f760b25e12
[Random] Pick a node for O(1), not for O(n)
...
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
2015-04-02 00:23:35 +03:00
Alexandre Beslic
98f2e2a908
Merge pull request #547 from jimmyxian/master
...
'docker tag/push' api implementation
2015-04-01 14:22:42 -07:00
Anton Tiurin
0618c29be2
[Store] Drop an index variable in Store.All
...
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
2015-04-02 00:04:43 +03:00
Alexander Morozov
81f9b72c64
Bump API version and docs to v1.19
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-01 13:40:56 -07:00
Tibor Vass
4467b6a2cb
Merge pull request #11974 from crosbymichael/registry-jobs
...
Remove jobs from registry.Service
2015-04-01 16:32:41 -04:00
Victor Vieux
1f2bd67555
Merge pull request #549 from snrism/update_token_and_filter_readme
...
Update token and filter readme
2015-04-01 13:26:02 -07:00
Evan Hazlett
be9113abf8
Merge pull request #934 from ehazlett/driver-doc-updates
...
driver doc updates
2015-04-01 15:57:18 -04:00
Simon Leinen
b58c4b8e68
Make explanation consistent with command
...
To reduce confusion of the reader. Fixes a likely cut & paste error.
Signed-off-by: Simon Leinen <simon.leinen@gmail.com >
2015-04-01 21:54:21 +02:00
Evan Hazlett
10c390fcb9
Merge pull request #938 from normalfaults/patch-1
...
Corrected command to load proper swarm environment
2015-04-01 15:18:13 -04:00
Sriram Natarajan
6c1eeef280
Update Filters README with dependency filter link
...
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com >
2015-04-01 12:17:25 -07:00
Evan Hazlett
dc2dcfd79b
updated docs per comments
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-04-01 15:11:31 -04:00
Sriram Natarajan
74a9a04a60
Fix discovery token README
...
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com >
2015-04-01 12:09:53 -07:00
Victor Vieux
b304a453f4
use 1024 as total cpushare for a machine
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-04-01 11:49:00 -07:00
Alexandre Beslic
2c94f22f4c
Merge pull request #548 from liuggio/patch-1
...
fixed readme for newcomer
2015-04-01 11:37:52 -07:00
Alexander Morozov
7101419c1c
Merge pull request #11990 from duglin/11985-RemoveDeadCode
...
Remove dead code looking for non-existent err msg
2015-04-01 10:46:10 -07:00
Jay
6e46204ab8
Added information about accessing host directory on Windows.
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-04-01 13:36:43 -04:00
Giulio De Donato
7510b25c5f
added mkdir -p
...
Signed-off-by: Giulio De Donato <liuggio@gmail.com >
2015-04-01 19:21:01 +02:00
André Martins
8f7ac20bac
Fixes docker events since beginning of unix time
...
Fixes issue #11555
Applied a workaround to check if since and until flags are valid or not.
Signed-off-by: André Martins <martins@noironetworks.com >
2015-04-01 18:14:59 +01:00
Alexander Morozov
624de8a9cd
Merge pull request #11949 from MabinGo/fix_randombug_in_eventtest
...
Fix random error in cli events test
2015-04-01 09:26:48 -07:00
Doug Davis
39908fc6d9
Add support for more advanced ${xxx:...} syntax
...
Just ${xxx:+...} and ${xxx:-...} for now
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-01 08:11:15 -07:00
Aanand Prasad
78227c3c06
Merge pull request #1202 from aanand/jenkins-script
...
WIP: Jenkins script
(cherry picked from commit 853ce255ea )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-04-01 11:00:51 -04:00
Daniel Nephin
e4e802d1f8
Merge pull request #1213 from moysesb/relative_build
...
Make value of 'build:' relative to the yml file.
(cherry picked from commit 0f70b8638f )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-04-01 11:00:48 -04:00
Aanand Prasad
b24a60ba9f
Merge pull request #1226 from aanand/merge-multi-value-options
...
Merge multi-value options when extending
(cherry picked from commit e708f4f59d )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-04-01 11:00:45 -04:00
Aanand Prasad
461b600068
Merge pull request #1225 from aanand/fix-1222
...
When extending, `build` replaces `image` and vice versa
(cherry picked from commit 6dbe321a45 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-04-01 11:00:40 -04:00
Nirmal Mehta
d7d91a4f1d
Corrected command to load proper swarm environment
2015-04-01 10:46:43 -04:00
moxiegirl
39711c8b26
Merge pull request #11969 from powo/patch-1
...
Update networking.md (IPv6 wrong prefix)
2015-04-01 07:45:31 -07:00
Doug Davis
d351aef8af
Remove dead code looking for non-existent err msg
...
Closes #11985
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-01 07:37:10 -07:00
moxiegirl
dc564d8cf8
Merge pull request #11972 from thaJeztah/docs-fix-heading-level
...
docs: fix heading level of logging drivers
2015-04-01 07:34:45 -07:00
moxiegirl
f73109b883
Merge pull request #11982 from sunyuan3/docker-run
...
Fix typoes in docker-run.1.md
2015-04-01 07:32:06 -07:00
Evan Hazlett
f6192d1363
Merge pull request #937 from sunyuan3/overwritten
...
Fix a typo in version.go
2015-04-01 09:53:14 -04:00
Evan Hazlett
1b81ddeb90
Merge pull request #882 from tombee/env-usage-hint
...
Added env usage hint for bash and fish shells
2015-04-01 09:22:30 -04:00
James Turnbull
a73b7354a6
Merge pull request #11954 from ankushagarwal/#11953
...
Use different host and container port for clarity
2015-04-01 09:21:15 -04:00
Xian Chaobo
1a607fd8fa
update README.md
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-04-01 18:19:47 +08:00
Xian Chaobo
33933b1922
tag/push api implementation
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-04-01 18:17:47 +08:00
Yuan Sun
f027b47045
Fix a typo in version.go
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-01 17:56:50 +08:00
Laurent Arnoud
e3cff5d17d
Docs: fix env_file example
...
Thanks-to: @aanand
Signed-off-by: Laurent Arnoud <laurent@spkdev.net >
2015-04-01 11:15:09 +02:00
Yuan Sun
a44451d40e
Fix typoes in docker-run.1.md
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-01 17:09:01 +08:00
Deng Guangxing
f5a401d3fe
docker info show logging driver info
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
2015-04-01 16:05:14 +08:00
Mabin
e15c3e36cc
Fix random bug in cli events test
...
Signed-off-by: Mabin <bin.ma@huawei.com >
2015-04-01 11:00:01 +08:00
Lei Jitang
7105f93a72
Add some missing option to bash completion
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-01 10:35:05 +08:00
Diogo Monica
9a495fa942
Initial working server commit
2015-03-31 18:40:07 -07:00
Daniel Nephin
0f70b8638f
Merge pull request #1213 from moysesb/relative_build
...
Make value of 'build:' relative to the yml file.
2015-03-31 21:20:02 -04:00
Michael Crosby
98cfa2aecd
Merge pull request #11975 from duglin/FixOOMTest
...
Increase timeout on TestRunOOMExitCode test
2015-03-31 17:24:26 -07:00
Doug Davis
8d1455d88b
Increase timeout on TestRunOOMExitCode test
...
I can never get it to work for me when its just 3 seconds.
With this change it generates the OOM message around 17 seconds, but
I increased the timeout to 30 for people with slower machines
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-03-31 16:57:43 -07:00
Michael Crosby
e736f16bbd
Merge pull request #11930 from unclejack/broadcastwriter_refactor
...
pkg/broadcastwriter: use []byte to lower alloc
2015-03-31 16:47:23 -07:00
Stephen Day
5052dc692f
Merge pull request #283 from sthulb/client-certs
...
registry, configuration, doc: client certificates for authentication purposes.
2015-03-31 16:45:03 -07:00