Jessie Frazelle
f7429a2121
Merge pull request #7871 from vincentbernat/update/zsh-completion-1
...
zsh: update zsh completion for docker command
2014-09-08 11:25:55 -07:00
Tibor Vass
43eab4034b
Merge pull request #7938 from unclejack/make_run_test_verbose
...
integ-cli: increase verbosity for mem & cpu test
2014-09-08 14:10:58 -04:00
Michael Crosby
18edea2a6f
Merge pull request #7609 from ewindisch/max_imgname
...
Restrict length of repository names
2014-09-08 11:06:54 -07:00
Michael Crosby
11700512b9
Merge pull request #7920 from unclejack/fix_layer_permissions
...
ensure correct permissions are set for directories
2014-09-08 10:51:50 -07:00
unclejack
05a76477e6
integ-cli: increase verbosity for mem & cpu test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-08 20:46:45 +03:00
unclejack
cc5fb986b0
integ-cli: test correct directory permissions
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-08 20:02:40 +03:00
Alexandr Morozov
2360d4a440
Merge pull request #7886 from jfrazelle/7047-json-line-delim
...
Fix line delimited JSON response
2014-09-08 20:47:21 +04:00
Jessica Frazelle
d2f75a3040
Fix line delimited JSON response
...
For GET /events, line delimit JSON.
Fixes #7047
Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com >
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com > (github: )
2014-09-08 09:41:26 -07:00
Tibor Vass
68e07f3fa0
Merge pull request #7914 from jfrazelle/7802-backwards-compat-state
...
fixes #7802 , when api version 1.11 is `json.Marshal`ing the container st...
2014-09-08 12:39:55 -04:00
Tianon Gravi
60ab9eaf4a
Merge pull request #7868 from baloo/patch-1
...
Switch TESTFLAGS to use `-test.run` instead of `-run`
2014-09-08 10:34:49 -06:00
Jessica Frazelle
f49c3f287b
fixes #7802 , when api version 1.11 is json.Marshaling the container struct
...
Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com >
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com > (github: )
2014-09-08 09:30:33 -07:00
Leszek Kowalski
691bbf6a29
Include directories that contain changes inside them when calculating diff. Fixes #6722
...
Docker-DCO-1.1-Signed-off-by: Leszek Kowalski <github@leszekkowalski.pl > (github: ljk)
2014-09-08 19:11:48 +03:00
James Turnbull
8f0034c3ee
Merge pull request #7933 from ahmetalpbalkan/doc-remote_api_client_libraries.md
...
add C# docker client library link to remote API client libraries doc
2014-09-08 07:25:24 -04:00
Ahmet Alp Balkan
cde53c51b5
add C# docker client library link
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2014-09-07 23:29:04 -07:00
Sven Dowideit
4b3ee6c106
Merge pull request #7908 from nhsiehgit/issue363imgfix
...
added a css fix for the image bug issue
2014-09-08 11:10:03 +10:00
Nathan Hsieh
e44bdd612b
added a css fix for the image bug issue
...
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
(github: nhsiehgit)
2014-09-05 10:48:51 -07:00
Tianon Gravi
38186084b3
Merge pull request #7893 from tianon/travis-run-tests
...
Update Travis to also run the test suite
2014-09-05 09:19:38 -06:00
James Turnbull
712702aa79
Merge pull request #7894 from SvenDowideit/use-local-jquery
...
Use a local copy of jquery so that the docs work in China, and offline too.
2014-09-05 08:51:09 -04:00
Sven Dowideit
5fe94f0d91
Use a local copy of jquery so that the docs work in China, and offline too.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-09-05 11:48:34 +10:00
Victor Vieux
b0cff06c97
Merge pull request #7883 from LK4D4/fix_build_race
...
Fix race between dispatchers.run and toDisk
2014-09-04 17:32:46 -07:00
Sven Dowideit
03fdc7d2c1
Merge pull request #7890 from fredlf/docs-cherry-pick-update-process
...
Changes to Sven's cherry pick process
2014-09-05 09:58:18 +10:00
Tianon Gravi
068b9ac4d2
Update Travis to also run the test suite
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-09-04 17:20:02 -06:00
Tibor Vass
1a2a4f61ab
Merge pull request #7878 from LK4D4/fix_net_for_none
...
Don't initialize network for 'none' mode
2014-09-04 15:30:03 -07:00
Tianon Gravi
d3b5bf5d24
Merge pull request #7763 from jamtur01/kate
...
Add syntax highlighting file for KDE's "Kate" editor
2014-09-04 15:28:11 -06:00
Fred Lifton
b23daef3ec
Changes to Sven's cherry pick process
...
Added content and revised after walk-through
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-09-04 13:32:16 -07:00
James Turnbull
f7c0ac9a8b
Merge pull request #7873 from jankeromnes/patch-1
...
Update SSH demo to ubuntu 14.04
2014-09-04 15:45:55 -04:00
Jan Keromnes
98f57d1c39
Update SSH demo to ubuntu 14.04
...
Signed-off-by: Jan Keromnes <janx@linux.com >
2014-09-04 20:27:41 +02:00
James Turnbull
bc26aa7b50
Merge pull request #7876 from nhsiehgit/typofix
...
small typo. wrapping cut code snippet
2014-09-04 12:37:07 -04:00
Alexandr Morozov
f17410da5e
Fix race between dispatchers.run and toDisk
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-04 19:43:28 +04:00
Alexandr Morozov
ba24820284
Don't initialize network for 'none' mode
...
Fixes #7837
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
2014-09-04 09:50:58 +04:00
Sven Dowideit
dbe1123607
Merge pull request #7828 from vieux/update_api_docs
...
Remote api docs for POST /containers/create were out of sync with runconfig/config.go
2014-09-04 13:05:06 +10:00
Sven Dowideit
e1907bafb7
Merge pull request #7858 from somaopensource/typo-fix
...
Dockerfile documentation typo and content fix
2014-09-04 13:03:04 +10:00
Michael Crosby
d9fc61066d
Merge pull request #7864 from unclejack/fix_panic_registry_session
...
registry/session: fix panic in GetRemoteImageLayer
2014-09-03 18:17:03 -07:00
Nathan Hsieh
adc9a14db4
small typo. fixed broken code snippet
...
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com > (github: nhsiehgit)
2014-09-03 17:53:45 -07:00
Victor Vieux
68c256cd40
Merge pull request #7875 from tiborvass/fix-integration-panic
...
Fix panic in integration-cli
2014-09-03 17:33:04 -07:00
Tibor Vass
39310448da
handle empty envvars for DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in daemon test framework
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-09-03 17:14:19 -07:00
Tibor Vass
defe01daf8
fix race in daemon test framework
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-09-03 17:14:19 -07:00
Victor Vieux
affef9e785
Merge pull request #7865 from cure/master
...
fix typos in error messages
2014-09-03 16:03:20 -07:00
Tibor Vass
782cde2c0f
Merge pull request #7818 from thomasleveil/completion-docker-build
...
Add --force-rm to docker build command completion
2014-09-03 14:44:13 -07:00
James Turnbull
a3326c3469
Merge pull request #7850 from fredlf/add_cherrypick_process
...
Add cherrypick process
2014-09-03 17:33:49 -04:00
Vincent Bernat
dc2eab2cf4
zsh: update zsh completion for docker command
...
zsh completion is updated with the content of
felixr/docker-zsh-completion.
The major change since the last merge is the removal of use of
sed/awk. This should help a lot OSX users who previously had to install
gawk and gsed.
Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im > (github: vincentbernat)
2014-09-03 22:30:11 +02:00
Ward Vandewege
a447894946
fix typos in error messages
...
Signed-off-by: Ward Vandewege <ward@jhvc.com > (github: cure)
2014-09-03 13:12:10 -04:00
Arthur Gautier
2a7770a712
The correct option for go test is -test.run not -run
2014-09-03 19:06:25 +02:00
unclejack
9c413e3e6f
registry/session: fix panic in GetRemoteImageLayer
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 17:26:56 +03:00
Thomas LÉVEIL
40f0bf7564
Add --force-rm to docker build command completion
...
Signed-off-by: Thomas LEVEIL <thomasleveil@gmail.com >
2014-09-03 14:26:16 +02:00
Oh Jinkyun
476f1df36f
Dockerfile documentation typo and content fix
...
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com >
2014-09-03 19:28:01 +09:00
Alexandr Morozov
58dc474e65
Merge pull request #7542 from unclejack/refactor_archive_buffering
...
Refactor archive buffering
2014-09-03 12:39:14 +04:00
unclejack
84d76e556b
archive: use pooled bufio readers and writers
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 11:37:03 +03:00
unclejack
2d2016b81b
pkg/pool: add pools for bufio readers & writers
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 11:36:39 +03:00
unclejack
bd130e72a0
pkg/ioutils: add ReaderErrWrapper to readers
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-09-03 11:36:21 +03:00