288d61145c
Merge pull request #3480 from tianon/gofmt
...
Run 'gofmt -s -w'
Upstream-commit: 1f9abfe841e75a9000bd670b6c1c8fed89bd772e
Component: engine
2014-01-07 06:41:23 -08:00
d1c770b847
Missing pipe in line 85
...
Upstream-commit: 2b93f1822322e957e7652db2645462ef2ec256bd
Component: engine
2014-01-07 15:20:38 +01:00
af7e2d6bbd
Run 'gofmt -s -w'
...
Upstream-commit: 8f3b8f383519452001cc05bf6505e9c301ebe954
Component: engine
2014-01-06 22:14:35 -07:00
87eb8def1e
Merge pull request #3477 from creack/fix_tar_leaks
...
Make CopyFileWithTar use a pipe instead of a buffer. Save more than 1Gb of ram for a 500Mb file.
Upstream-commit: fca83b4cfb41dbb5dcd933e4944453bac8cea0d3
Component: engine
2014-01-06 18:04:44 -08:00
c075e98c4c
Make CopyFileWithTar use a pipe instead of a buffer. Save more than 1Gb of ram for a 500Mb file.
...
Upstream-commit: 444a087ac2ca34776b2b3e4433aa35c27cdfd57a
Component: engine
2014-01-06 17:44:22 -08:00
966d13ca39
Update REMOTE_TODO.md
...
Upstream-commit: e1c861cf331b416c45a5e79102de3b44b13bf1a0
Component: engine
2014-01-06 17:37:30 -08:00
6bb653314b
Remove the @github handle as it generates emails.
...
Upstream-commit: 6fe3da9924fc22bd02eba0803abb42b10fc28baf
Component: engine
2014-01-06 17:21:14 -08:00
a9ae796dbd
Merge pull request #3473 from dhrp/docs-version-warning-fix
...
[docs] Fix for wrong version warning on master instead of latest.
Upstream-commit: f43f3fa2187450aacbb72380903b109f45d3d0cd
Component: engine
2014-01-06 16:26:04 -08:00
d7eba898f1
[docs] Fix for wrong version warning on master instead of latest.
...
Upstream-commit: 1e551c7cc5badc043b1d6a651c3f036c996ef538
Component: engine
2014-01-06 16:18:00 -08:00
7660906e4a
Merge pull request #3328 from shykes/pkg-iptables
...
Move utility package 'iptables' to pkg/iptables
Upstream-commit: 2c395ce8fb29bb64a1d6ed6d893116bf8a255c41
Component: engine
2014-01-06 15:54:07 -08:00
d5d32a285c
Move utility package 'iptables' to pkg/iptables
...
Upstream-commit: 7799ae27ca1dd85761f0595346a0dda15bbeda6c
Component: engine
2014-01-06 15:41:24 -08:00
563b24676d
Merge pull request #3388 from tianon/more-build-tests
...
Add more TestBuild Dockerfiles, especially for 'echo shebang' testing
Upstream-commit: bb754fd34d380fd59f87f6d198361c9ba7239e10
Component: engine
2014-01-06 15:14:30 -08:00
2514b9eb9b
Merge pull request #3420 from RoelVanNyen/getfullname
...
Cleanup: runtime.getFullName is deprecated by getFullName
Upstream-commit: a0298c0bd070400b4acaad3c2d285037b5875552
Component: engine
2014-01-06 13:59:04 -08:00
a94fa6d2ee
Merge pull request #3384 from tianon/fix-load-help
...
Fix "docker load" help by removing "SOURCE" prompt and mentioning STDIN
Upstream-commit: a86a82cb7e6159fc48c40b6e07e63c911100801c
Component: engine
2014-01-06 13:30:16 -08:00
29c9c05aae
Fix dotCloud to Docker, Inc
...
Upstream-commit: 36ab1836f973c62ff543456f1613dec8813d00df
Component: engine
2014-01-06 12:26:53 -08:00
656cb5bac1
Fixed registry unit tests
...
Upstream-commit: 5e8912e0e8537c526ee4f162bdade2656c2fa803
Component: engine
2014-01-06 21:04:44 +01:00
54d230777d
Merge pull request #3377 from cpuguy83/3333-fix_-H_default
...
Make blank -H option default to the same as no -H was sent
Upstream-commit: 4e414f62052fd0389d79122db5b0071ddab5d027
Component: engine
2014-01-06 11:30:27 -08:00
3d5851faf7
Merge pull request #3310 from pnasrat/cgroups-subpackage
...
Extract cgroups utilities to own submodule.
Upstream-commit: 4f31141e13bad1c4494a15dd9f283107fc85eee1
Component: engine
2014-01-06 11:27:29 -08:00
426d639912
fix error on docker wait
...
Upstream-commit: 82531f71681c9b5bc5a6c871f81ef67f9e92d708
Component: engine
2014-01-06 11:11:04 -08:00
cc98eeb0c8
Merge pull request #3297 from jaseg/master
...
Return meaningful error for meaningless Dockerfiles
Upstream-commit: ee6823d797e527a18291561aa84cfd6346dd3893
Component: engine
2014-01-06 10:58:24 -08:00
b2ebfa1e4f
Merge pull request #3426 from bcbcarl/3425-upgrade_vbox_guest_additions
...
Upgrade VBox Guest Additions (Fix #3425 )
Upstream-commit: 1363dfdd1d6ccb2612d35c3fb29d460a58ba33b9
Component: engine
2014-01-06 10:39:26 -08:00
dcc35456a2
Tweak formatting for GCE instructions
...
Upstream-commit: b308e33106832cd4452f473ff0a54c2031070e0a
Component: engine
2014-01-06 10:35:51 -08:00
1c8add2753
Merge pull request #3367 from cpuguy83/3362-unify_cmd_entrypoint_handling
...
Use same error handling while unmarshalling args for CMD and ENTRYPOINT
Upstream-commit: e5b09523dcfabcd252113a8ebda5391c88e777e5
Component: engine
2014-01-06 10:29:37 -08:00
1e33ac0792
Merge pull request #3441 from RoelVanNyen/container_start
...
Just pass the container in RegisterLinks(), no need to lookup by name
Upstream-commit: d44abae873f9327962ee9a2ad079a17c582e9661
Component: engine
2014-01-06 10:19:01 -08:00
81433035f2
Use same error handling while unmarshalling args for CMD and ENTRYPOINT
...
Upstream-commit: 323c4b5211ecef4cffcbe0a97811ddd93c469164
Component: engine
2014-01-06 13:15:14 -05:00
acd3d57601
Merge pull request #3335 from vieux/remote_todo
...
add REMOTE_TODO
Upstream-commit: 5b4a0cac4ef0b8197b9088fd2228ff3b690889cd
Component: engine
2014-01-06 10:12:08 -08:00
3ca59b8ac9
Merge pull request #3455 from crigor/fix-pull-message
...
Fix login message to say pull instead of push.
Upstream-commit: 73294b6d561e98a9ebf490f3a2819c6a329693b9
Component: engine
2014-01-06 10:02:32 -08:00
35ca0566a9
Simplified and streamlined Amazon Quickstart
...
The amazon quickstart images are EBS backed and include cloudinit. I've personally tested these documentation changes as a new user to Docker.
Upstream-commit: d6ca05f7cb6fd75a77967049c22eac7104d94633
Component: engine
2014-01-06 09:53:58 -08:00
99c49adf29
Merge pull request #3445 from dotcloud/merge_release_v0.7.3
...
Merge release v0.7.3
Upstream-commit: dfc2dc4d355cac57a7b119c6a1db49a1ca5c85fd
Component: engine
2014-01-06 09:51:41 -08:00
d48dec166d
Fixed error in group add example
...
There is no ${USERNAME} in bash, only ${USER}
Upstream-commit: fc559d999256a8171015f18fd67e51c39ea5aa32
Component: engine
2014-01-06 09:29:56 -08:00
a8ce549c09
Update instructions for mtu flag for Docker on GCE
...
Upstream-commit: ea762c1a51a7dfbb08294c2b6fa105095dd193b3
Component: engine
2014-01-06 09:29:33 -08:00
9d009d4705
Fix login message to say pull instead of push.
...
Upstream-commit: 599009191a6d9aa157de10c296909829b93bc00e
Component: engine
2014-01-05 17:07:16 +08:00
ee3a7b50db
Merge pull request #3454 from sudosurootdev/master
...
Fix spelling error in hack/make.sh comment
Upstream-commit: af50b2f17c66b789de079861fb3f5e5678cb8d30
Component: engine
2014-01-04 20:24:48 -08:00
4e140a2de4
Spelling error.
...
Upstream-commit: 2a1181f404387f6d530a86a6196b40a6dd541c20
Component: engine
2014-01-04 23:15:15 -05:00
844b950018
Merge pull request #3448 from tmahesh/patch-1
...
Changelog date typo fix: 2013-01-02 -> 2014-01-02
Upstream-commit: f7afbf34fe8e608997cc9b43784bc78fd2886be8
Component: engine
2014-01-04 08:21:48 -08:00
c46f1834e7
Changelog date typo fix: 2013-01-02 -> 2014-01-02
...
Upstream-commit: 3069bf946047e42b4aa468617caffb45829317b6
Component: engine
2014-01-04 11:24:48 +05:30
f8f546ba21
Change version to 0.7.3-dev
...
Upstream-commit: 32b9a429c5d36785a4a544d6e7236a95a4310983
Component: engine
2014-01-03 17:02:59 -07:00
a04cd2e096
Merge pull request #3439 from dotcloud/bump_v0.7.3
...
Bump v0.7.3
Upstream-commit: 76910d16cc9e0d11bd60939d1855639fd2930362
Component: engine
2014-01-03 16:01:56 -08:00
8b66161d6d
Just pass the container in RegisterLinks(), no need to lookup by name again
...
Upstream-commit: 42c7dc448f550c954aeba14cd20d1dff12845c73
Component: engine
2014-01-03 15:49:39 +01:00
5e06bc9bb4
Bump version to v0.7.3
...
Upstream-commit: 8502ad4ba7b5410eb55f3517a801b33f61b1f625
Component: engine
2014-01-02 21:19:19 -07:00
c5289665c4
substantial spelling fix
...
Upstream-commit: 58ec7855bc4f724a32f585f4455b5d954f335c3c
Component: engine
2014-01-02 16:46:50 -08:00
b8a11b19d9
Merge pull request #3437 from jamtur01/faqhere
...
Fixed duplicate here references in FAQ
Upstream-commit: 949fde88df5c11447cea7115ce3a2bcf7c73ed6d
Component: engine
2014-01-02 16:44:38 -08:00
64b666faf6
Fixed duplicate here references in FAQ
...
Upstream-commit: 5a9f45cb7ae44bb194b2643994c6a0d53b856645
Component: engine
2014-01-02 19:40:19 -05:00
f9507b6c4d
Merge pull request #3428 from jamtur01/port1.8
...
Added some 1.7 API updates that were missing from 1.8
Upstream-commit: 8f4a54734fac24b4e7ce3019c9a693d7ed72c577
Component: engine
2014-01-02 16:34:56 -08:00
c44a0a380b
Merge pull request #3389 from SvenDowideit/3366-simplify-volumes-documentation
...
simplify the volumes documentation and mention more details
Upstream-commit: 9359d79c4f39c94b6fd1826bd66a41f9f4303b09
Component: engine
2014-01-02 16:29:09 -08:00
ca1a9efe84
Added some 1.7 API updates that were missing from 1.8
...
Upstream-commit: 69db6ea867ca155ecf6c342e82df491cdcd6aa96
Component: engine
2014-01-02 19:27:59 -05:00
1298c1b521
Merge pull request #3409 from Chris00/patch-1
...
Mention lxc-checkconfig
Upstream-commit: 3b89187d0388ea386cf2c8e00361744442e46654
Component: engine
2014-01-02 16:20:30 -08:00
8ca6e8443f
Keep original transcript in Thatcher's voice
...
and clarify that this is an update to the example.
Upstream-commit: 82a47b0e82367aa5f1b6d15816c7e66abdffb06a
Component: engine
2014-01-02 16:17:52 -08:00
1aab0cdc3a
Merge pull request #3399 from rgstephens/patch-1
...
Update for Ubuntu 13.10
Upstream-commit: e0f07bc18614c5cc9065e75a3f43cdf4ca0ab605
Component: engine
2014-01-02 16:14:47 -08:00
cf9f2e5413
Merge pull request #3353 from creack/improve_add_cache
...
Improve add cache
Upstream-commit: 194eb246efc68647fd5c4efc240b49fc76235a90
Component: engine
2014-01-02 16:07:33 -08:00
