Vincent Batts
683038bf57
Merge pull request #6727 from unclejack/improve_bytes_range
...
Improve layer downloading
2014-07-23 15:31:25 -04:00
Michael Crosby
92cba0845c
Merge pull request #7170 from unclejack/fix_testinspectlinksstopped
...
integcli: fix TestInspectLinksStopped with Go1.3
2014-07-23 11:19:11 -07:00
Michael Crosby
c71edef8d5
Merge pull request #7190 from vieux/merge_release_v1.1.2
...
Change version to 1.1.2-dev
2014-07-23 11:16:18 -07:00
Victor Vieux
56bb7ce780
Change version to 1.1.2-dev
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-23 18:09:02 +00:00
Michael Crosby
604a975303
Merge pull request #7164 from fcarriedo/not-error-as-var-name
...
pkg/units: Better to not use `error` as var name
2014-07-23 11:04:03 -07:00
James Turnbull
b9024174be
Merge pull request #7180 from rhuss/patch-1
...
Fixed parent-child relationship description
2014-07-23 10:17:19 -07:00
Fred Lifton
be3aa1eba0
Merge pull request #7176 from SvenDowideit/auto-update-master-cli-docs
...
user facing documentation changes in master atm
2014-07-23 10:15:02 -07:00
Roland Huß
0a4b39b6a4
Fixed parent-child relationship description
...
"db" is the parent image, and "web" links to it as the child image. There was a typo in the document which reversed the relation.
2014-07-23 10:23:14 +02:00
SvenDowideit
5743cc3423
user facing documentation changes in master atm
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-23 12:40:10 +10:00
Michael Crosby
885cda1ae2
Merge pull request #7167 from unclejack/maintainer_truncindex
...
pkg/truncindex: add unclejack to MAINTAINERS
2014-07-22 17:10:38 -07:00
Victor Vieux
9e1a9a7d98
Merge pull request #7163 from crosbymichael/fix-port-mapping-on-restart
...
Always mark as stopped for non running containers
2014-07-22 16:55:46 -07:00
Sven Dowideit
2f23e204d9
Merge pull request #7151 from SvenDowideit/add-version-selection-ux
...
Add version selection ux to the Documentation.
2014-07-23 09:21:55 +10:00
Francisco Carriedo
ea7b8ea03f
pkg/units: Better to not use error as var name
...
Better to not use `error` as var name (might eclipse the error type) for
clarity and to prevent subtle bugs.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-22 15:39:59 -07:00
unclejack
d0cbc54f23
integcli: fix TestInspectLinksStopped with Go1.3
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-23 01:15:29 +03:00
Tianon Gravi
a491d204a0
Merge pull request #7157 from tianon/check-config-apparmor_parser
...
Add "apparmor_parser" warning to check-config.sh
2014-07-22 15:38:08 -06:00
Victor Vieux
314bf61889
Merge pull request #7165 from fcarriedo/remove-named-returns
...
pkg/units: Remove unused named returns
2014-07-22 14:37:49 -07:00
Sven Dowideit
0d118ffbf8
Merge pull request #7169 from fredlf/update_osx-install
...
Initial revisions to b2d doc, new screenshots.
2014-07-23 07:34:06 +10:00
Fred Lifton
4002b4623c
Initial revisions to b2d doc, new screenshots.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Final revisions to B2D doc.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-07-22 13:14:42 -07:00
unclejack
7407664c66
pkg/truncindex: add unclejack to MAINTAINERS
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-22 23:08:28 +03:00
Francisco Carriedo
588090c49b
pkg/units: Remove unused named returns
...
Remove named returns since not used in function body. Might prevent
potential subtle bugs.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-22 12:16:50 -07:00
Victor Vieux
c838a4be29
Merge pull request #7162 from nathanleclaire/tar-with-options-err-check
...
Add missing error check
2014-07-22 11:37:21 -07:00
Victor Vieux
ceddf4c0e8
Merge pull request #7160 from fcarriedo/7159-test-coverage
...
pkg/units: Increased test coverage
2014-07-22 11:27:46 -07:00
Nathan LeClaire
a1c5f268e5
Add missing error check
...
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@docker.com > (github: nathanleclaire)
2014-07-22 10:41:58 -07:00
Francisco Carriedo
c47ab1425f
pkg/units: Increased test coverage. Closes #7159 .
...
Increased coverage:
* Added test cases to size_test.go
* Added coverage for duration.go
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-22 09:56:58 -07:00
Tianon Gravi
75ba7a9b32
Add "apparmor_parser" warning to check-config.sh
...
If AppArmor is enabled on the current system, but "apparmor_parser" isn't installed, it causes all kinds of issues.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-22 10:34:28 -06:00
SvenDowideit
4d109f6158
avoid publishing to the root unless specified, so old version releases only goto their own dir
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-22 19:05:18 +10:00
SvenDowideit
3472c006c4
Add more details so I have more of an over-view of what I need to
...
automate
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-22 18:04:48 +10:00
SvenDowideit
3853a9c612
the build cache is too agressive, and I am regularly getting builds using an old version - forcing the issue
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-07-22 17:21:03 +10:00
Michael Crosby
ddb2086ca9
Copy values out of hostConfig
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-22 00:16:26 -07:00
Michael Crosby
a091d949ac
Always mark as stopped for non running containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
2014-07-21 19:59:44 -07:00
Sven Dowideit
9dc82e6102
Merge pull request #7134 from MidnightDesign/patch-1
...
Fix a typo in the tutorial
2014-07-22 12:00:06 +10:00
Sven Dowideit
1cc55fda3d
Merge pull request #7112 from proppy/patch-8
...
docs/installation/google: update gcloud options
2014-07-22 11:22:08 +10:00
Sven Dowideit
324010ad66
Merge pull request #7030 from runvnc/patch-1
...
Better example for data container
2014-07-22 10:49:27 +10:00
Sven Dowideit
8f75de2d4e
Merge pull request #6569 from bcexelbi/rhel-install-update
...
Updated Red Hat Enterprise Linux installation instructions for version 7
2014-07-22 10:30:18 +10:00
Victor Vieux
1473374a2a
Merge pull request #7078 from unclejack/fix_archive_tar_pax_headers
...
archive/tar: update to fix writing of PAX headers
2014-07-21 17:26:41 -07:00
Michael Crosby
b7ff33f73c
Merge pull request #7146 from dmp42/master
...
Joining registry maintainers
2014-07-21 17:02:52 -07:00
Olivier Gambier
ebc05cbbea
Joining registry maintainers
...
Docker-DCO-1.1-Signed-off-by: Olivier Gambier <olivier@docker.com > (github: dmp42)
2014-07-22 01:50:32 +02:00
Victor Vieux
d0e2d9ec39
Merge pull request #6976 from vbatts/vbatts-early_daemon_pidfile
...
docker daemon: initialize the daemon pidfile early
2014-07-21 14:26:14 -07:00
Fred Lifton
61b675d3bb
Merge pull request #7104 from mheon/sigproxy_docs
...
Update docs on --sig-proxy
2014-07-21 13:42:41 -07:00
Aaron Huslage
d8a76a02dc
Merge pull request #6996 from soulshake/patch-1
...
Update https.md
2014-07-21 12:22:59 -07:00
soulshake
319a8a241e
Resolve merge conflict, attempt 3
...
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net > (github: soulshake)
2014-07-21 12:18:59 -07:00
Vincent Batts
b752e7402a
Merge pull request #7050 from Aigeruth/fix/push_image_layer_registry_content_type
...
Add Content-Type header in PushImageLayerRegistry
2014-07-21 15:07:01 -04:00
Michael Crosby
86f20e561f
Merge pull request #7061 from muchweb/rms
...
Can't believe you forgot RMS
2014-07-21 12:02:45 -07:00
Michael Crosby
6dd8eb9520
Merge pull request #7090 from philips/add-philips-to-systemd-maintainers
...
contrib/init/systemd: add philips as MAINTAINER
2014-07-21 11:41:38 -07:00
Michael Crosby
e4c79736bf
Merge pull request #7122 from LK4D4/move_some_run_tests_to_cli
...
Move some run tests to cli
2014-07-21 11:25:36 -07:00
Johan Euphrosine
e1bb99d925
docs/installation/google: update gcloud options
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-07-21 10:55:12 -07:00
Tianon Gravi
ed92c3f964
Merge pull request #7124 from tianon/travis-compile
...
Adjust Travis to also compile, to test that compilation still succeeds
2014-07-21 11:38:15 -06:00
Michael Crosby
12ee68aabe
Merge pull request #7116 from timthelion/relativevolumeerror
...
Give context for the error that occures when you try to bind mount a vol...
2014-07-21 10:22:35 -07:00
unclejack
c47ebe7a35
get layer: remove HEAD req & pass down response
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-21 20:21:18 +03:00
unclejack
f033ce3ee9
resumablerequestreader: allow initial response
...
Make it possible to inspect an initial response and pass it to
ResumableRequestReader. This makes it possible to inspect an initial
response and passing it to ResumableRequestReader to avoid making an
extra request.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-21 19:54:25 +03:00