a63f83c19a
Merge pull request #2881 from yrashk/patch-1
...
Fix command line help for docker save
Upstream-commit: 677e2ad92ef526918e5054b5afe1fbd858219fa3
Component: engine
2013-11-28 16:42:40 -08:00
108a9c911c
Merge pull request #2818 from pnasrat/docker-pprof
...
Wire in pprof handlers.
Upstream-commit: 3faf450f11d92a6cbcf498ee85b57f4743612aac
Component: engine
2013-11-28 14:43:13 -08:00
7a655fcbd8
Merge pull request #2937 from jwarwick/hello_world_doc
...
Remove explanation of removed argument
Upstream-commit: a0525d90abd7ab3c95ae90302ffcc8c69fe6f429
Component: engine
2013-11-28 14:35:17 -08:00
f98721fac4
Merge pull request #2922 from ath0mas/patch-1
...
Restore 'save' paragraph
Upstream-commit: 14425c1690d56f8c472f93a1d01bfd40cd3a4f78
Component: engine
2013-11-28 14:15:43 -08:00
6805e23c72
Merge pull request #2888 from tianon/changelog-fix
...
Fix CHANGELOG: we ended up not merging the btrfs driver for last night's release
Upstream-commit: aae23255a0ce02d96dd58267e3adf503aabeb458
Component: engine
2013-11-28 12:24:56 -08:00
391598f889
Merge pull request #2892 from creack/add_cli_test-1
...
Add ParseRun unit tests
Upstream-commit: 3d0486979e32c503625dbe96de625f7ebd29e2d6
Component: engine
2013-11-28 11:39:48 -08:00
9eafea47b6
Merge pull request #2913 from pnasrat/2852-deleteimage-performance
...
Performance of deleteImageAndChildren.
Upstream-commit: 377817db1b2fadf9c4294d8356aa7c75eb12e83a
Component: engine
2013-11-28 11:20:43 -08:00
798ad27de8
Wire in pprof handlers.
...
Based on http://stackoverflow.com/questions/19591065/profiling-go-web-application-built-with-gorillas-mux-with-net-http-pprof
Upstream-commit: 9f46779d42c9b90a70c3c434d03a4502070e1b6d
Component: engine
2013-11-28 13:46:58 -05:00
4b1fc75599
Remove explanation of removed argument
...
Upstream-commit: f1e44e0b0c6eff011c596008c75f7fdff09dbf5e
Component: engine
2013-11-28 09:55:15 -05:00
28b7c6878a
Merge pull request #2927 from andrewsmedina/stat_macos
...
Move syscall.Stats logic to os specific file.
Upstream-commit: 597ca192e720821dfdf94b3b8d0bec74bee63ee7
Component: engine
2013-11-27 18:32:18 -08:00
3f2a763338
Move syscall.Stats logic to os specific file.
...
related to #2909 .
Upstream-commit: 8b2a7e35c35f894dca0795a4fde9ec0cfe04ce43
Component: engine
2013-11-28 00:22:47 -02:00
ac3797d133
Restore 'save' paragraph
...
Upstream-commit: 2c27da881807b6c63ef29e8033241a17c76f5ab7
Component: engine
2013-11-28 00:39:06 +01:00
804f3d1553
Merge pull request #2914 from crosbymichael/open-issues
...
Add instructions for opening issues on the repository
Upstream-commit: 39f21af6879bb69550084db4188985598beb3800
Component: engine
2013-11-27 15:25:12 -08:00
b9024bb8a7
Merge pull request #2831 from SvenDowideit/please-ignore-squiggle-backup-files
...
Please ignore squiggle backup files
Upstream-commit: 7f9cdaa342a724dca42d3882e07c294ea972361c
Component: engine
2013-11-27 11:04:21 -08:00
3abe5b8a85
Add instructions for opening issues on the repository
...
Upstream-commit: e4ae44b844a38327ee4288361376299595b1917e
Component: engine
2013-11-27 10:41:20 -08:00
3e874ec270
Merge pull request #2814 from dotcloud/release_checklist_update
...
update release checklist
Upstream-commit: 89454851d12c73c2865799c3d192eeaf55746b87
Component: engine
2013-11-27 10:04:55 -08:00
92016b6859
Merge pull request #2904 from SvenDowideit/dont-show-user-internal-slash-in-error-message
...
there appears to be a slash prepended to a container name internally
Upstream-commit: f75dc36204b37d9cb292fd3cf949e1cec1142c36
Component: engine
2013-11-27 09:58:24 -08:00
d6d10d16ca
Merge pull request #2910 from codeaholics/wait-for-simultaneous-pull
...
Allow multiple clients to pull the same tag simultaneously
Upstream-commit: 5fe5055bd9ba0f66eb8fddd6ba261e0e6893886a
Component: engine
2013-11-27 09:58:13 -08:00
d103214bb0
Performance of deleteImageAndChildren.
...
Don't walk the file system for parents each time we recurse.
Fixes #2852
Upstream-commit: 4e826e99b278ef3cc438553e958727397b4d9ee7
Component: engine
2013-11-27 12:55:15 -05:00
a17dc473b7
Handle the case where poolAdd() gives an error for an unknown pool type
...
Upstream-commit: 788feab3a7de44a4749e5a861e3b6f778aa4088b
Component: engine
2013-11-27 16:53:36 +00:00
55a368beae
Allow multiple clients to pull the same tag simultaneously
...
If two clients simultaneously try to pull the same tag, there was a race
whereby one would succeed and the second would generate an error. Now,
the second simply waits for the first to complete.
Upstream-commit: ae474e05f553c7abefc8674148e2a84a417bbf64
Component: engine
2013-11-27 12:18:01 +00:00
121a1998cc
tell anyone that might want to ignore their editor choice's backup files that there is a better way - thanks @pnasrat
...
Upstream-commit: 7b95d410926bffa6d8f42095fa8b38e01a5ac67b
Component: engine
2013-11-27 13:19:06 +10:00
f43b960fe1
there appears to be a slash prepended to a container name internally - don't tell the user about it in an error message, it might cause them to worry about it
...
Upstream-commit: 1cb7b9adc6b9a4e4c8f746c6886a7229b0efda91
Component: engine
2013-11-27 12:58:54 +10:00
9d0c3761bc
Merge pull request #2887 from kleptog/master
...
Add mkseccomp.pl, helper script to make seccomp profiles.
Upstream-commit: 6344e6f258c7aef7d805b6ede8a94bde4372d7df
Component: engine
2013-11-26 15:24:35 -08:00
e74bd14f25
Add parseRun volume unit tests
...
Upstream-commit: 462e30dcbdc5010abe21b206bcd4be0c8bc71be6
Component: engine
2013-11-26 23:03:50 +00:00
f70d58d92d
Make volumes opts more strict
...
Upstream-commit: c7661f40b6c6a23e5fe2090a94bd9fa6521242d7
Component: engine
2013-11-26 23:00:44 +00:00
8e6cdb74dc
Add ParseRun unit tests
...
Upstream-commit: c707c587c1fbd8e68f1e9a3c64ee0aca764461eb
Component: engine
2013-11-26 20:16:16 +00:00
7a9a45e0c5
Fix CHANGELOG: we ended up not merging the btrfs driver for last night's release
...
Upstream-commit: 8398abf0dcda8fa7818b69355af9b99ab4e8bdfc
Component: engine
2013-11-26 09:36:46 -07:00
323783b03d
Add mkseccomp.pl, helper script to make seccomp profiles.
...
Upstream-commit: ab3a83c617ec5bfafee117ea0b6e92ce78bd46e5
Component: engine
2013-11-26 17:13:02 +01:00
c4d496c52c
Merge pull request #2884 from nikai3d/patch-1
...
fix typo in CONTRIBUTING.md
Upstream-commit: 8b99e4ed374b8048a548556a6ff97d2f2598a5f5
Component: engine
2013-11-26 07:40:49 -08:00
4c67203399
Merge pull request #2872 from goldmann/runtime_typo
...
Fix the 'but is not' typo
Upstream-commit: 17efa9dc2ddd50f686dc3092b6d2ae45aa39b303
Component: engine
2013-11-26 07:40:25 -08:00
7dd10871ef
fix typo in CONTRIBUTING.md
...
Upstream-commit: 76c71260f13af3005c2407e2a19a422741b97117
Component: engine
2013-11-26 16:13:39 +01:00
c7a4b3b1ae
Fix command line help for docker save
...
`docker save IMAGE DESTINATION` is not what `docker save` expects
Upstream-commit: 82674372946b431f93add255e137f82822eecfc1
Component: engine
2013-11-26 06:54:46 -08:00
f587c327f7
Fix the 'but is not' typo.
...
Upstream-commit: 9c15322894152095539e41623ef33ec0ebdc6c3f
Component: engine
2013-11-26 11:18:50 +01:00
64a1f0700d
Merge pull request #2870 from dotcloud/fix-links-parsing
...
fix -link parsing
Upstream-commit: 06d5e25224f8e24cbf8fd367437789ec32f592ca
Component: engine
2013-11-26 00:09:09 -08:00
3a30422210
fix -link parsing
...
Upstream-commit: 009024ad6439fad28ab3a9d8db6b6844bfbba8c9
Component: engine
2013-11-26 00:05:46 -08:00
69e3f71f64
Merge pull request #2869 from dotcloud/fix-docker-pull-run
...
fix docker run on an unknown image
Upstream-commit: 18d08d0d427f6350b5742264f200475792f40c9f
Component: engine
2013-11-25 23:28:15 -08:00
8d3710fbe5
fix docker run on an unknown image
...
Upstream-commit: 0bb2c0b1d0f651e23c949381762fe79a45c58aeb
Component: engine
2013-11-25 23:20:36 -08:00
2f99c2efdc
Merge branch 'release'
...
Upstream-commit: 233ad38802174cc5a3458a34bebaf78472a348d1
Component: engine
2013-11-25 22:25:47 -08:00
278ec44cf0
Merge pull request #2857 from shykes/0.7-release
...
0.7 release
Upstream-commit: db28e839e0292a9d4c9c24b33c4267703baa6e5b
Component: engine
2013-11-25 22:14:33 -08:00
ae49d218bd
Add 0.7.0 Changelog entry, with notable high-level features since 0.6.0.
...
Upstream-commit: de30ffb2c3b9aa86a5abd6a40b661cec247c6dbd
Component: engine
2013-11-26 06:06:22 +00:00
16e900a1c2
Bump version file to 0.7.0
...
Upstream-commit: 5c5ee194cb383be42c0d0b9fc53114fa991de564
Component: engine
2013-11-26 06:06:22 +00:00
a9075c1b0d
Merge pull request #2868 from jamtur01/ubtfixes
...
Tidied up Ubuntu installation documentation
Upstream-commit: b6dd67c70779d42dc36dd662becb247b79a7c083
Component: engine
2013-11-25 22:05:36 -08:00
7d7d4a875e
Merge pull request #2867 from shykes/more-random-names
...
Add more moods and inventor names to random name generator
Upstream-commit: 740958dda7ec0efd6ba77a5dab892019d4755bd3
Component: engine
2013-11-25 22:04:29 -08:00
cf209a1700
Remove non-ascii characters from name generator
...
Upstream-commit: c38386d876aab1c1e3391de2180cb03f083f8955
Component: engine
2013-11-26 06:02:37 +00:00
36c5097638
Merge pull request #2866 from tianon/binaries-docs
...
Update "Binaries" installation language to point to distro packages first
Upstream-commit: 4267fb66efd36e0c8cf564feb1e6d570902c45b1
Component: engine
2013-11-25 22:00:20 -08:00
2136e5ee7f
Tidied up Ubuntu installation documentation
...
Upstream-commit: a74b512540d24c89b64ca62933f4512c4804f3ed
Component: engine
2013-11-26 00:58:17 -05:00
be70b4650a
Add more moods to random name generator
...
Upstream-commit: 60809a4f72984881e8a8dc07bf585f07975baf7d
Component: engine
2013-11-26 05:55:48 +00:00
ff01a9f153
Update "Binaries" installation language to point to distro packages first
...
Also, added a minor consistency update to our usage of "wget".
Upstream-commit: 65fcc81b426ced8f416da3260770705ac7c90580
Component: engine
2013-11-25 22:53:50 -07:00
174bb35f3e
Merge pull request #2865 from tianon/arch-docs
...
A couple tiny docs consistency fixes
Upstream-commit: 06cf8fee1b9b588e0096349e94a0cb95948c014e
Component: engine
2013-11-25 21:53:16 -08:00
