23d0088241
Removed unused function layerArchive
...
Signed-off-by: Blake Geno <blakegeno@gmail.com >
Upstream-commit: 7cff8db4a381f68d503fe828fb0fb35cf979741c
Component: engine
2014-10-17 10:49:21 -04:00
f3d73e7359
Merge pull request #8531 from SvenDowideit/move-registry-search-to-registry-api
...
Move registry search API docs into the registry API document.
Upstream-commit: 6ce4f82ebe822dbc3cf945abba5f8a09ca48ea9f
Component: engine
2014-10-16 18:27:37 -07:00
635235ea21
Merge pull request #8591 from fredlf/1.3release-notes
...
Edits and additions to release notes.
Upstream-commit: 57263ef0d6255f7b46b91fefb3c059d01efa35d0
Component: engine
2014-10-16 18:26:11 -07:00
6be2afe715
Edits and additions to release notes.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Added link for CVEs.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Fixed some URLs.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: d79defb7478973a0b554bc775efb1bf716fbcb1f
Component: engine
2014-10-16 18:16:52 -07:00
3c3b4af606
Edits and additions to release notes.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Added link for CVEs.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: b61ad60675999439bc2d937afbb0c3c82f6f7b06
Component: engine
2014-10-16 18:06:32 -07:00
180b93af0b
Merge pull request #8599 from irachex/commit_docs
...
Fix commit api document
Upstream-commit: 62cb97278d1ff35a13a09cc845c64d6a417f5874
Component: engine
2014-10-16 16:10:49 -07:00
a4666e24dd
Merge pull request #8238 from vbatts/vbatts-daemon_timestamps
...
daemon logging: unifying output and timestamps
Upstream-commit: cb106e74a14a37157b09459965a69c944f9c19f0
Component: engine
2014-10-16 15:55:49 -07:00
31d40db865
Merge pull request #8544 from SvenDowideit/link-to-latest-b2d-installers
...
Link directly to the 'latest' release alias
Upstream-commit: 2e35d7c905756314c12e10a50b36ecc46a70d31a
Component: engine
2014-10-16 15:52:24 -07:00
a2918879a4
Merge pull request #8516 from jamtur01/sshd
...
Minor changes to SSHd example
Upstream-commit: 69e3a55560df06a23cc74ba54badf120e5271bf9
Component: engine
2014-10-16 15:44:10 -07:00
cde87628c0
Merge pull request #8232 from vbatts/vbatts-devmapper_getDeps
...
devmapper: include dm_deps information in debug
Upstream-commit: 2f9ffe5b6ac1c547d1b5c228637007b05af48a3f
Component: engine
2014-10-16 14:13:21 -07:00
ae2c341183
Merge pull request #8380 from cpuguy83/moar_names
...
Add more names
Upstream-commit: 0e67cf0627a60595f0aac51693f9266a893d5295
Component: engine
2014-10-16 14:04:15 -07:00
fcf584741e
Merge pull request #8465 from SvenDowideit/document-device-flag-permission-options
...
Add info on --device flag permissions ':rwm'
Upstream-commit: 4b594721c409318040d691d2dc1a58dbbab888b5
Component: engine
2014-10-16 14:00:09 -07:00
64ddbf3bfd
Merge pull request #8526 from vbatts/vbatts-too_many_open_files
...
client: even cleaner use of Transport
Upstream-commit: f0eb1ef4e17b76cf628b1c233017cbf87963257f
Component: engine
2014-10-16 13:53:31 -07:00
71238096f7
Merge pull request #8566 from jfrazelle/Cleanup-fmt-%q
...
Cleanup: integration-cli ('%s' with %q)
Upstream-commit: b3cda9fc7e9dbdc23619c84ed91ad41d931b6e27
Component: engine
2014-10-16 13:51:46 -07:00
f3fe82488d
Merge pull request #8549 from vieux/pkg_units
...
add BytesSize in pkg/units
Upstream-commit: 1183abc4aa98c92b69f8134f3fd83e1071d0cc52
Component: engine
2014-10-16 13:44:50 -07:00
da21283cdb
Merge pull request #8612 from jfrazelle/8611-ip-masq-iptables
...
Setting iptables=false should propagate to ip-masq=false
Upstream-commit: d1aca045b3970a862f6bfb0b8106e9266b66f88c
Component: engine
2014-10-16 13:35:37 -07:00
9110a950dd
Merge pull request #8606 from tianon/release-home
...
Fix more missing HOME references
Upstream-commit: 40a6461d16f9fc4111e9c9a844447d0a7170ce41
Component: engine
2014-10-16 12:12:38 -07:00
85566d62c3
Merge pull request #8608 from crosbymichael/merge_release_v1.3.0
...
Merge release v1.3.0
Upstream-commit: c3237cc9d8356be505e29f22967aa84ea0c939d0
Component: engine
2014-10-16 12:12:21 -07:00
d6ca289754
Merge pull request #8609 from gesellix/patch-2
...
fix minor docs error
Upstream-commit: 3d0d2fd183cbe3b95982aaf0d0c62d29961d927f
Component: engine
2014-10-16 15:06:00 -04:00
47427bd007
Setting iptables=false should propagate to ip-masq=false
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
Upstream-commit: 3893e220e840054dfdadba637372bc30f683fe58
Component: engine
2014-10-16 11:52:14 -07:00
dace4f710e
fix minor docs error
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 143f438e6e7a4c8205af59ba6e9f52cb450f1cce
Component: engine
2014-10-16 19:36:36 +02:00
ad45324600
Change version to 1.3.0-dev
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: db21b556ceb365895b84628a2e75c61672d3adef
Component: engine
2014-10-16 17:22:42 +00:00
711cbcb6e5
Merge branch 'release' into merge_release_v1.3.0
...
Upstream-commit: 30806ebc0fbd91725eaf19d22903571f955d6a1b
Component: engine
2014-10-16 17:22:27 +00:00
eda4d7b0de
Merge pull request #8323 from crosbymichael/bump_v1.3.0
...
Bump to version 1.3.0
Upstream-commit: c78b920e01c5d050105cd702fec46a4cc3b0d1f8
Component: engine
2014-10-16 10:08:54 -07:00
966c634d3c
Fix more missing HOME references
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Upstream-commit: d040de6dd4660041dd37792a9a702cf8317a71d9
Component: engine
2014-10-16 10:14:26 -06:00
f5e599aefb
Fix commit api document
...
The commit message field should be `comment`, not `m`
https://github.com/docker/docker/blob/master/api/server/server.go#L478
Signed-off-by: Huayi Zhang <irachex@gmail.com >
Upstream-commit: f6140060e3b7fc8e6f577ca95be0eb5bf8cd1fd4
Component: engine
2014-10-16 18:10:58 +08:00
453a4cc3b3
Merge pull request #8595 from fredlf/signed-image-doco
...
Expanded release notes
Upstream-commit: 2eb9c0bfd457665840b1bc5b80cc5a967c1ede5d
Component: engine
2014-10-15 23:20:14 -07:00
7a37e6bf0d
Expanded release notes
...
Made it clear signed images is a preview feature and added a little more info about how the feature works.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 74d0485885cbb0e5f7561bd31399e5c13209d8d6
Component: engine
2014-10-15 16:08:07 -07:00
1051381a0b
Bump to version 1.3.0
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: c78088fe3d1b90640c637d8c3457de3caa0c7a24
Component: engine
2014-10-15 19:15:24 +00:00
d0f2bc8dd1
Merge branch 'master' into bump_v1.3.0
...
Upstream-commit: 87bd2da5d8030a3a1909784e4f2ab1f258e8278a
Component: engine
2014-10-15 19:15:13 +00:00
d86ec1998c
Merge pull request #8578 from erikh/fix_slash
...
builder: Handle trailing \ appropriately.
Upstream-commit: 9a827137725d13dbe14c577df40dc35d061152b3
Component: engine
2014-10-15 12:11:37 -07:00
33fccf1f63
Merge pull request #8579 from erikh/builder_html_panic
...
builder: handle anything we cannot parse the command for as a fatal error
Upstream-commit: abec82bdeee84cef603561ae29fed45e45130a7c
Component: engine
2014-10-15 12:01:52 -07:00
b0a547e200
Merge pull request #8582 from SvenDowideit/api-docs-link-to-basics-page
...
The basics page moved, update link.
Upstream-commit: 73792969e62bed273dc8aca609d513e80856807a
Component: engine
2014-10-15 11:34:25 -07:00
7e0088079e
builder: provide a friendly message on parser errors
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 3f2eb353bdbb36ce26690909bcf761d4289294d6
Component: engine
2014-10-15 18:08:23 +00:00
8a33177d4b
Merge pull request #8583 from SvenDowideit/minimal-curl-command-to-tls-docker-socket
...
Add a little info on how to talk to the TLS encrypted Docker Socket
Upstream-commit: 9c6346e9b2be615ef93ef50cf24550c8afbe4e39
Component: engine
2014-10-15 11:01:05 -07:00
5406659093
Merge pull request #8580 from erikh/filter_comments_first
...
builder: strip blank lines before processing any line continuations.
Upstream-commit: de5b1b8bb01cfd9352b4e3127c4a19db22e85d46
Component: engine
2014-10-15 11:00:31 -07:00
4a6aadc8cd
builder: handle anything we cannot parse the command for as a fatal error.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 63637b9d277d322a06f24e3195fab48bc2a705d6
Component: engine
2014-10-15 08:47:15 +00:00
ac6df7dc24
builder: comments should also be elided in the middle of statements following a line continuation.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 96f342f7030c3955900f8f2ddf06b0d36b1d993c
Component: engine
2014-10-15 08:44:14 +00:00
eb924a4c12
Add a little info on how to talk to the TLS encrypted Docker Socket
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 1c68de798fdebba5eefa1c66a79e946c7bb06fb5
Component: engine
2014-10-15 17:24:53 +10:00
256f3dd5a2
The basics page moved, update link.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: a64ff0bf7a8c69e5698dc7e757d4ac56dd91b738
Component: engine
2014-10-15 16:48:43 +10:00
8a73cf85f8
builder: strip blank lines before processing any line continuations.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: a1ef2207dd1f63a4104cfbf7927931174f5438a5
Component: engine
2014-10-15 04:00:17 +00:00
61f914763d
builder: Handle trailing \ appropriately.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 7fa449191ce9abc3e0a5261b66d8338948f66940
Component: engine
2014-10-15 03:08:18 +00:00
04647d4951
Replace '%s' in test utils
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 949ab477103c93d6d4779b35efbd647541eb1b14
Component: engine
2014-10-14 10:59:38 -07:00
edf116b62c
Replace '%s' in run tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: c091397d518408a7a9c493f066dc47438d588985
Component: engine
2014-10-14 10:59:19 -07:00
ad9f9cb9fd
Replace '%s' in rm tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: be31a66b7a1f015d4f1448baebd7c7eb2c23e506
Component: engine
2014-10-14 10:59:11 -07:00
5203b5e653
Replace '%s' in diff tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: a44296603f8188278241cc8d8a353952ee50ec54
Component: engine
2014-10-14 10:59:01 -07:00
be07c0e702
Replace '%s' in create tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 91f33fcaaaa47ef60acc4a8cfa7a2be41edd724e
Component: engine
2014-10-14 10:58:35 -07:00
f5ae3b0b1b
Merge pull request #8564 from tiborvass/remove-docker-dot-io
...
change docs.docker.io to docs.docker.com in install script
Upstream-commit: dc243c812b7f5584bb5c1d0008839e4bdf0152c0
Component: engine
2014-10-14 10:53:10 -07:00
80f48778b2
change docs.docker.io to docs.docker.com in install script
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: e5e0baa6d4651dd0182413f0db622ab82e53841f
Component: engine
2014-10-14 13:45:26 -04:00
acd86543a1
Merge pull request #8563 from crosbymichael/remove-key-create
...
Remove client key.json generation for trust
Upstream-commit: a29837020b02d94ea6065116e0b60c3290c5d40f
Component: engine
2014-10-14 10:45:15 -07:00
