3382b4e552
Merge pull request #7231 from vieux/allow_stack_trace
...
allow sigquit to display stacktrace in debug mode
Upstream-commit: 7dde97640f9935c35104de6aa09dfcf33ba20ffc
Component: engine
2014-07-25 21:34:25 +03:00
420900ca68
Merge pull request #7227 from tianon/generate-authors
...
Add new script to generate AUTHORS and regenerate AUTHORS (fixing a few new dups too)
Upstream-commit: 7756bcc7abe5d50f74ceebc4a6a7fc9c5ba1a0c7
Component: engine
2014-07-25 12:31:47 -06:00
a1541fc2ac
Merge pull request #7234 from michielbdejong/patch-1
...
Typo in dockervolumes.md line 141?
Upstream-commit: c028bb239ffcd76a3812c82f75bcfc8083e7632c
Component: engine
2014-07-25 13:14:50 -04:00
154cd33cd7
Typo in dockervolumes.md line 141?
...
Upstream-commit: 9503afbc9116b06585cf42715a7ae0bcd0fb7881
Component: engine
2014-07-25 09:06:38 +02:00
86189cd855
Merge pull request #7185 from thaJeztah/patch-1
...
Fix incorrect path in ENTRYPOINT example
Upstream-commit: ff28b0b9194ffdad15ea459e123e2f5b674dc7e6
Component: engine
2014-07-25 17:06:29 +10:00
ed094d474a
allow sigquit to display stacktrace in debug mode
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 5b293f15967c3358b84fabd72723d4bb6571bae0
Component: engine
2014-07-25 01:08:04 +00:00
a808375eeb
Merge pull request #7225 from vieux/update_path
...
update go import path and libcontainer
Upstream-commit: 228c6a374bf5fa47b0e19751ddc9148052bb7bbc
Component: engine
2014-07-24 17:22:21 -07:00
d2405bde3d
Add new script to generate AUTHORS and regenerate AUTHORS (fixing a few new dups too)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 771ed2391536ad722e32be519039454cc98668e8
Component: engine
2014-07-24 16:49:39 -06:00
adbef64a84
revert AUTHORS changes
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 10822462624d9eb3e1801577540613d74b1bb225
Component: engine
2014-07-24 22:30:05 +00:00
2273fb0f55
gofmt -s -w
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 5a0ef08c940b9a17c400389bca8e7f54935ceba9
Component: engine
2014-07-24 22:25:29 +00:00
6ae4c9014c
update go import path and libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
213b4560ad
Merge pull request #7212 from mheon/kill_zero
...
Properly handle 0 being passed as a signal number
Upstream-commit: 2481e08e416d3cda0ed5ac73e6cbae99eea18414
Component: engine
2014-07-24 11:42:16 -07:00
47f3d8fd92
Merge pull request #7179 from LK4D4/add_cap_audit_write_#6345
...
Add AUDIT_WRITE cap
Upstream-commit: 2ed10eae5b909ae1920f9dfba98b0a3b63ce29a9
Component: engine
2014-07-24 10:02:44 -07:00
9c11a229c5
Properly handle 0 being passed as a signal
...
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
Upstream-commit: be326b0ece345e7f28d663ac06c8614d58070326
Component: engine
2014-07-24 11:06:20 -04:00
0b23dd95aa
Merge pull request #7199 from ipbabble/mp-changes
...
Fixed some typos for '--' Vs '-' in docker-run-1.md
Upstream-commit: 0758acfb03a3a93903e0f4a109f6e9e30b07fbc1
Component: engine
2014-07-24 06:51:56 -07:00
53aae89bf0
Fix incorrect path in ENTRYPOINT example
...
The ENTRYPOINT example uses "/usr/bin/ls" as path, but `ls` is located at `/bin/ls`.
Docker-DCO-1.1-Signed-off-by: Sebastiaan van Stijn <github@gone.nl > (github: thaJeztah)
Upstream-commit: 2819d9b4062914daa5b6bd4d08676807859eae3f
Component: engine
2014-07-24 14:48:23 +02:00
44fd11bd23
Merge pull request #7148 from tianon/buildtags-docs
...
Reorganize and clarify the DOCKER_BUILDTAGS docs
Upstream-commit: 9380e8cbe71f18f20293408246f3652e1c5c9b33
Component: engine
2014-07-23 22:27:07 -06:00
c9b056319d
Merge pull request #7181 from timruffles/patch-3
...
[DOCS] replace foo/bar with concrete names
Upstream-commit: bb6217c0556709c7e911faa8e968c3f72a38464d
Component: engine
2014-07-24 12:26:10 +10:00
41e66d1933
Merge pull request #7108 from unclejack/archive_speedup
...
speed up archive
Upstream-commit: 6b65e8817c76517b42264413e1aad4657fc3c1e0
Component: engine
2014-07-23 16:54:35 -07:00
c26325b9c4
Typo changes to docker-run-1.md - changing '-' to '--' where approp.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Upstream-commit: 140337296353b2dd37678b0e30cbf0ebe2cfd9e7
Component: engine
2014-07-23 16:49:07 -04:00
a8f0d4ce31
Merge pull request #6727 from unclejack/improve_bytes_range
...
Improve layer downloading
Upstream-commit: 683038bf57ce56c2f8eb433eb9bd00b2c17cae92
Component: engine
2014-07-23 15:31:25 -04:00
b6bbf7e188
Merge pull request #7170 from unclejack/fix_testinspectlinksstopped
...
integcli: fix TestInspectLinksStopped with Go1.3
Upstream-commit: 92cba0845c046c0dac2af74b5d717bc799c91984
Component: engine
2014-07-23 11:19:11 -07:00
78b5f15752
Merge pull request #7190 from vieux/merge_release_v1.1.2
...
Change version to 1.1.2-dev
Upstream-commit: c71edef8d5194afe7839ae690589668ec346d5ac
Component: engine
2014-07-23 11:16:18 -07:00
ed37d36716
Change version to 1.1.2-dev
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 56bb7ce780dc5fc2c5134291fbbea28169a479b1
Component: engine
2014-07-23 18:09:02 +00:00
b62c8f48b7
Merge pull request #7164 from fcarriedo/not-error-as-var-name
...
pkg/units: Better to not use `error` as var name
Upstream-commit: 604a975303230cec2684bfede67cedbd9bc50d4d
Component: engine
2014-07-23 11:04:03 -07:00
6dc7b294a3
Merge pull request #7180 from rhuss/patch-1
...
Fixed parent-child relationship description
Upstream-commit: b9024174be37919e85c3127cf0d41f6d94d835c3
Component: engine
2014-07-23 10:17:19 -07:00
f12a50f553
Merge pull request #7176 from SvenDowideit/auto-update-master-cli-docs
...
user facing documentation changes in master atm
Upstream-commit: be3aa1eba0c07dff3024190433233f54554c3ae1
Component: engine
2014-07-23 10:15:02 -07:00
d72a089030
[DOCS] replace foo/bar with concrete names
...
namespaces are not well documented, and I had to jump around to other docs. replacing `foo/bar` hopefully makes what's going on here a bit more obvious.
Docker-DCO-1.1-Signed-off-by: Tim Ruffles <timruffles@gmail.com > (github: timruffles)
Upstream-commit: 455e837e207a01153947fc81e3a22d6bb37d2c89
Component: engine
2014-07-23 15:21:16 +01:00
6f7c4cc1d5
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.
Upstream-commit: 0a4b39b6a4e9faeea5d8c679e7b03e317a7b02f9
Component: engine
2014-07-23 10:23:14 +02:00
da9850e0f6
Add AUDIT_WRITE cap
...
Fixes #6345
Thanks @larsks for outstanding investigation
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 29ecc95c31ecfe15e3b3d8db94cea1c555e526a3
Component: engine
2014-07-23 09:57:41 +04:00
a347eb0112
user facing documentation changes in master atm
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5743cc3423b48a0a3c78c7640bb10d840c911604
Component: engine
2014-07-23 12:40:10 +10:00
b782732841
Merge pull request #7167 from unclejack/maintainer_truncindex
...
pkg/truncindex: add unclejack to MAINTAINERS
Upstream-commit: 885cda1ae252b2ca6d256410cc0bb8c0dc7e8823
Component: engine
2014-07-22 17:10:38 -07:00
46232832e7
Merge pull request #7163 from crosbymichael/fix-port-mapping-on-restart
...
Always mark as stopped for non running containers
Upstream-commit: 9e1a9a7d9824be67a9a02b24607b64f3738c7ef4
Component: engine
2014-07-22 16:55:46 -07:00
9140b4810a
Merge pull request #7151 from SvenDowideit/add-version-selection-ux
...
Add version selection ux to the Documentation.
Upstream-commit: 2f23e204d9190895ae761d97495fdbd7093b625a
Component: engine
2014-07-23 09:21:55 +10:00
204cff966e
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)
Upstream-commit: ea7b8ea03f5c2222060afe435e907c1ab855a44b
Component: engine
2014-07-22 15:39:59 -07:00
c8bd24665b
integcli: fix TestInspectLinksStopped with Go1.3
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: d0cbc54f234b01585670e19b49a8c931b2719472
Component: engine
2014-07-23 01:15:29 +03:00
4d5322d880
Merge pull request #7157 from tianon/check-config-apparmor_parser
...
Add "apparmor_parser" warning to check-config.sh
Upstream-commit: a491d204a0e38f8e42d1f2edfd6e08bc0cd61a50
Component: engine
2014-07-22 15:38:08 -06:00
7e50734905
Merge pull request #7165 from fcarriedo/remove-named-returns
...
pkg/units: Remove unused named returns
Upstream-commit: 314bf61889d20945638e67cecde9fe98f273d5eb
Component: engine
2014-07-22 14:37:49 -07:00
f95bb42771
Merge pull request #7169 from fredlf/update_osx-install
...
Initial revisions to b2d doc, new screenshots.
Upstream-commit: 0d118ffbf83711bf8f6271308e290ab011bc460e
Component: engine
2014-07-23 07:34:06 +10:00
724ac12239
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)
Upstream-commit: 4002b4623c91d94d93f8575c4a554392202aa44d
Component: engine
2014-07-22 13:14:42 -07:00
24cf66b391
pkg/truncindex: add unclejack to MAINTAINERS
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 7407664c6621782101f73162b7f0ad76a53fa46b
Component: engine
2014-07-22 23:08:28 +03:00
10f00b2b3a
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)
Upstream-commit: 588090c49bf2ec077626d89196515e6bef1f7a69
Component: engine
2014-07-22 12:16:50 -07:00
1ce4404428
Merge pull request #7162 from nathanleclaire/tar-with-options-err-check
...
Add missing error check
Upstream-commit: c838a4be2921f76bfaab2ef2641b8c2562c7b2dd
Component: engine
2014-07-22 11:37:21 -07:00
2575c87da6
Merge pull request #7160 from fcarriedo/7159-test-coverage
...
pkg/units: Increased test coverage
Upstream-commit: ceddf4c0e8da32c302f9fbfe3183d8c2acb80e31
Component: engine
2014-07-22 11:27:46 -07:00
951216bd40
Add missing error check
...
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@docker.com > (github: nathanleclaire)
Upstream-commit: a1c5f268e5465e0b3cdb4e2a47c0ade3de7988c0
Component: engine
2014-07-22 10:41:58 -07:00
64c32c0b31
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)
Upstream-commit: c47ab1425f0cf08168af7e5561e39ff2e39625e0
Component: engine
2014-07-22 09:56:58 -07:00
d94a180ef6
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)
Upstream-commit: 75ba7a9b32bc5904ef1b2751deff94283fce34a5
Component: engine
2014-07-22 10:34:28 -06:00
5fa2981ff0
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)
Upstream-commit: 4d109f6158c7607ee4cd9907b17ddba5f4d29d04
Component: engine
2014-07-22 19:05:18 +10:00
7bd6a5929b
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)
Upstream-commit: 3472c006c4246977eb4fd8c9d55ab416eb5c3d50
Component: engine
2014-07-22 18:04:48 +10:00
eb7d72cb32
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)
Upstream-commit: 3853a9c612e3d19dadea26153c9cebaec8cd67a4
Component: engine
2014-07-22 17:21:03 +10:00
