Commit Graph

10233 Commits

Author SHA1 Message Date
a8a998eeed Cleanup errorOut resp exec tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6f1c8ff4c4fd1f001917c3af89907731561642a6
Component: engine
2014-10-16 15:06:20 -07:00
2c526d9f92 Cleanup errorOut resp pull tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: eeb009729430f0858f56be37011325f3f9486386
Component: engine
2014-10-16 15:06:20 -07:00
960bb7c8ed Cleanup errorOut resp in images tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: dd248dee3c889fe376a89adcc9f9d19cafb9bf69
Component: engine
2014-10-16 15:06:20 -07:00
77ef164c1f Cleanup errorOut resp in version tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 50c3e7537c055a73a71999cb3ae9f2c6aa57efce
Component: engine
2014-10-16 15:06:20 -07:00
029dd9ca6c Cleanup errorOut resp in push tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f013506aad8b7c09b3c2d3307dadfa4b2d365d40
Component: engine
2014-10-16 15:06:20 -07:00
7e76a1cfb9 Cleanup errorOut resp in top tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 764030ec92f8cf8b47079c26d7c1393bd963fbf4
Component: engine
2014-10-16 15:06:20 -07:00
a1fc81a541 Cleanup errorOut resp in build tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b1e3c9e9cd49591f8efcbcd00d45bcd98fbe2831
Component: engine
2014-10-16 15:06:20 -07:00
c9b622420d Cleanup errorOut resp in save tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 0c87424007aa1220842acca26cbadc7c1a05bef9
Component: engine
2014-10-16 15:06:20 -07:00
d073e74963 Cleanup errorOut resp in rmi tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 0e3744ec8958faf88026338dcb096198399059e8
Component: engine
2014-10-16 15:06:20 -07:00
6c78c54dea Cleanup errorOut resp in inspect tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ac24cabd9d05fe8843a382bb55fe5f2dcd4b9da2
Component: engine
2014-10-16 15:06:19 -07:00
e1b85a8d45 Cleanup errorOut resp in ps tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: d33f2bdb114a9fd3c1413dbd4667440153df9431
Component: engine
2014-10-16 15:06:19 -07:00
2a8b0f0a3a Cleanup errorOut resp in search tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ef787eb824896471485522d343c62a6edb5c947f
Component: engine
2014-10-16 15:06:19 -07:00
0fb5fb3bb6 Cleanup errorOut resp in docker_utils.go
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 73eadbc6a1af80dfb1e933644a9a2927004e6d0f
Component: engine
2014-10-16 15:06:16 -07:00
198fd58622 Cleanup errorOut resp in diff test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ac62c5439ac6197c3afca66db4489f96296097b6
Component: engine
2014-10-16 15:05:00 -07:00
c635846b4b Cleanup errorOut resp in links test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7d38ae7041357e58edee5c26f721e39be9ff1fbd
Component: engine
2014-10-16 15:05:00 -07:00
043dfeea4f Cleanup errorOut resp in history test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f7b3a6b292a1f8dc7cfffe2e93622ea2c3419623
Component: engine
2014-10-16 15:05:00 -07:00
d97b62dff0 Cleanup errorOut resp in info test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b59d5a9dd2e0e474f04ce4eb31de41a1484d97bf
Component: engine
2014-10-16 15:05:00 -07:00
3fda727482 Cleanup errorOut resp in kill test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 0faf87598f19bd3520704ed18209afbbe6a6ee90
Component: engine
2014-10-16 15:05:00 -07:00
6e0d79bbf4 Cleanup errorOut resp in nat test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 17842840ec0fc7a0b66050b97692250b74d91372
Component: engine
2014-10-16 15:05:00 -07:00
fb004016c8 Cleanup errorOut resp in create test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6b858b59ed6e1f594e5552e3f5e8f46351466d78
Component: engine
2014-10-16 15:05:00 -07:00
3e3c1b0cf0 Cleanup errorOut resp in tag test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 475235ba7e5ad5a8c1f3bbbad6566bb646eac0f9
Component: engine
2014-10-16 15:05:00 -07:00
9253036ce7 Cleanup errorOut resp in export test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b645df1d39f942919a117bdf9f9528e38681dc0b
Component: engine
2014-10-16 15:05:00 -07:00
32993aa12f Cleanup errorOut resp in port test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 88d65cbdf4881c0e56556d9c8efbf60410f0645f
Component: engine
2014-10-16 15:05:00 -07:00
10afcc04ab Cleanup errorOut resp in commit test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Cleanup errorOut resp in commit test

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 3182ee5c9bc13f67858c3676a560427d4882f12c
Component: engine
2014-10-16 15:05:00 -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
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
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
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
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
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