d3339de046
Windows: Don't pull in all of resolvconf
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 78604a9f3fc7d08b39fea0e80dafaa6f8472b050
Component: engine
2015-05-11 15:28:08 -07:00
133eb58df5
DHE 1.0.1 release
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 38af208da1414dad81dbd96d7d8678bfb94f9dc0
Component: engine
2015-05-11 21:23:56 +00:00
478cbff61d
Merge pull request #13132 from LK4D4/fix_race_kill
...
Fix race between execdriver.Kill and execdriver.Run
Upstream-commit: a47fb5edca77536ea6ea024df0bc15978d172224
Component: engine
2015-05-11 14:01:07 -07:00
c578ab5fb7
Fix race between execdriver.Kill and execdriver.Run
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ca7219f5daa194ae714c3a3396703e08d8a137c8
Component: engine
2015-05-11 13:23:50 -07:00
84543fc3ec
Merge pull request #13074 from runcom/11824-short-link-if-equals-alias
...
Allow links to be specified with only the name if it matches the alias
Upstream-commit: 8cc93856e37f045060cce5345e28421514ba7833
Component: engine
2015-05-11 13:18:29 -07:00
60d5f903de
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c6e6223ed735b4ff6a15f5d5716376d765f60b09
Component: engine
2015-05-11 21:50:47 +02:00
a9a448c762
Merge pull request #12994 from Microsoft/10662-fixinvocation
...
Windows: Fix builder\dispatchers.go
Upstream-commit: e66ad40c4e62d784e23e0df39de0970c5ced3917
Component: engine
2015-05-11 11:24:43 -07:00
ceedb9d4b8
Merge pull request #13101 from bharaththiruveedula/13092-remove-unwanted-locks
...
Removing extra locks for Pause and Unpause functions
Upstream-commit: 5e063326a345349b406791a6822f6423e17c353d
Component: engine
2015-05-11 10:54:39 -07:00
203bb4326e
Merge pull request #13091 from LK4D4/generate_caps
...
Generate caps
Upstream-commit: 92344602eadd6500f9936593772e46cf7db2b518
Component: engine
2015-05-11 10:42:59 -07:00
8647686396
Merge pull request #13111 from gianlucaborello/fix-mac-documentation
...
Correctly document MAC address generation
Upstream-commit: 4d6720bfbb0a2f88d4733ca2a3103e3160d0cd33
Component: engine
2015-05-10 13:43:27 -04:00
240f5e3960
Merge pull request #13102 from duglin/MissingOK
...
Add missing "ok" on "comma ok" idiom in test util
Upstream-commit: 13064646a64cdc6772fe05ac4445d1498d76656a
Component: engine
2015-05-10 09:22:44 -07:00
9784ed801a
Default MAC address generation is not random and should be stated in the documentation.
...
Signed-off-by: Gianluca Borello <g.borello@gmail.com >
Upstream-commit: e324f51e5b7bf9d28701af97bdb9fcdc26fc7699
Component: engine
2015-05-10 08:11:26 -07:00
fc89bcb4ca
Removing extra locks for Pause and Unpause functions
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com >
Upstream-commit: 8c1ef5ceafcba2476693db7f5db39300ad2e7f88
Component: engine
2015-05-10 00:16:54 +05:30
a40ebffc52
Merge pull request #12988 from Mashimiao/remove-unused-container-functions
...
cleanup: remove unneeded locks
Upstream-commit: 340fd140e67901c8b5ad9d59c6fb693f6bbcffde
Component: engine
2015-05-09 09:42:27 -07:00
ab315ef02f
Merge pull request #13093 from tianon/writeflusher
...
Move WriteFlusher out of utils into ioutils
Upstream-commit: c5710c73185d81909b02c0c2683d6183aeef9e61
Component: engine
2015-05-09 09:39:17 -07:00
c55979eeda
Merge pull request #13095 from Microsoft/10662-pkgrexec
...
Windows: reexec pkg supported
Upstream-commit: 61cb6012e6b4085f9c867d826431368bb18896c8
Component: engine
2015-05-09 09:38:42 -07:00
104194a4ef
Add missing "ok" on "common ok" idiom in test util
...
w/o this the "ok" we're checking is from the previous type assertion.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: dd4693f67cb0ce5dc14c87ddf2a9a9f6a3406763
Component: engine
2015-05-09 05:56:10 -07:00
87d85e4c09
cleanup remove unneeded locks
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: bcc24ec8ad26ebb3564eb462fd80654964ff4651
Component: engine
2015-05-09 10:06:53 +08:00
560ba9b809
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
2015-05-09 10:02:46 +08:00
c39c5e2a47
Windows: reexec pkg supported
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 64715c4f33fdb98003b7fda8d1dcf9c65463de07
Component: engine
2015-05-08 14:15:53 -07:00
669b8fe47b
Windows: Fix builder\dispatchers.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4d2f6fbde012f6b58345cc21eadcd619db83b292
Component: engine
2015-05-08 11:45:08 -07:00
9906aa5fe1
Merge pull request #12978 from Microsoft/10662-containerexeccreate
...
Windows: Split ContainerExecCreate
Upstream-commit: 3697dddc0d913d0d4468a1570408390a336d8b7b
Component: engine
2015-05-08 11:38:03 -07:00
a9af2bce60
Move WriteFlusher out of utils into ioutils
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 223d6de728ac5df5394b4990f81a466c858d519c
Component: engine
2015-05-08 12:33:33 -06:00
11ef87f883
Generate capabilityList automatically
...
Generation based on CAP_LAST_CAP, I hardcoded
capability.CAP_BLOCK_SUSPEND as last for systems which has no
/proc/sys/kernel/cap_last_cap
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a559c1145af3162cd683866fd6f998ff5f57058f
Component: engine
2015-05-08 09:40:05 -07:00
aaee340d81
Update github.com/syndtr/gocapability to 66ef2aa7a23ba682594e2b6f74cf40c0692b49fb
...
It adds List function for listing all supported caps
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5a2d592c27e93cf7f3d01216cf6e22656330fe84
Component: engine
2015-05-08 09:22:37 -07:00
0d41ea39ed
Merge pull request #13071 from tianon/explicit-vendor
...
Update "hack/vendor.sh" to be more explicit
Upstream-commit: 23abd51ef15b2c0138e272708845750be5eb0b03
Component: engine
2015-05-08 08:22:17 -07:00
450b717836
Merge pull request #13069 from runcom/dry-run-test
...
API tests - Container create with Hostname, Domainname and Network
Upstream-commit: af9dac9627e7b04a803df152cc24f0db073ea17a
Component: engine
2015-05-07 22:07:41 -04:00
bda12eddfc
Merge pull request #12422 from wlan0/logopts
...
add log opts flag to pass in logging options
Upstream-commit: fe3becee34a93ebffe4a9fbcb0057d2b82242307
Component: engine
2015-05-07 18:10:04 -07:00
48cb321d93
Merge pull request #13080 from jfrazelle/fix-tests-where-requires-libcontainerr-security
...
fix lxc because it doesnt have the hardened libcontainer stuff
Upstream-commit: b94107c4d898e9b91c5940649779ed2129aadbc5
Component: engine
2015-05-07 18:07:27 -07:00
9b361889f7
Merge pull request #13027 from runcom/fix-typo-reference-remote-api
...
Fix typo in the api remote reference for links
Upstream-commit: 128a07b512bf119d2cf3ae536e1cb6d19bc0f460
Component: engine
2015-05-07 17:53:21 -07:00
7ea0137fad
fix lxc because it doesnt have the hardened libcontainer stuff
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 52118df432353dee2a37dd284462c4c021174a50
Component: engine
2015-05-07 17:40:37 -07:00
3d5681c540
Merge pull request #13077 from duglin/MoveCommands
...
Make list of commands for help less static
Upstream-commit: 47fbe76a7ed5d4bd2a1c2016c1c962e482db797e
Component: engine
2015-05-07 17:35:54 -07:00
92cec4b2c1
Merge pull request #11516 from coolljt0725/add_show_error_set_some_flag_in_container_netmode
...
add support --net=container with --mac-address, --add-host error out
Upstream-commit: 6b6a26c7697978bf7d43fec11d14ef6ee7e3e4d6
Component: engine
2015-05-07 17:13:32 -07:00
5c2686119c
Merge pull request #11802 from hqhq/hq_add_blkio_weight
...
add blkio.weight support
Upstream-commit: de32f5c431bbdb56d6a446af0e5660fae9539bd8
Component: engine
2015-05-07 17:10:39 -07:00
3cb88baa8b
Merge pull request #11831 from cellpjs/patch-1
...
Remove mkimage-unittest.sh
Upstream-commit: 982402f4e05aa7c3e89ead8fb07b5514a1961963
Component: engine
2015-05-07 17:07:56 -07:00
9fb1f7589d
Merge pull request #12175 from dqminh/fix-allocate-port
...
#12148 : sort ports mapping before allocating
Upstream-commit: e03ac8d5b98f525c3d32bb5a6ac84b2c5717a0dc
Component: engine
2015-05-07 17:04:20 -07:00
d482451b94
Merge pull request #12270 from burnison/11294-shortidfallback
...
Only use fallback to short IDs when obvious.
Upstream-commit: f6fa579d52a446d6a8171330ddad73602c79dd30
Component: engine
2015-05-07 17:02:58 -07:00
f08d29d6d6
Merge pull request #12278 from duglin/12267-Wildcards
...
Fix for Daemon crashing when wildcards are used for COPY/ADD
Upstream-commit: d0bc0153c637f0e61207fa90b0346174cd5e92e3
Component: engine
2015-05-07 17:01:16 -07:00
3bf284f32f
Merge pull request #12318 from aarondav/best-effort-iptables-lock
...
Do our best not to invoke iptables concurrently if --wait is unsupported
Upstream-commit: d0cbaeb0d28091ce4cddd1aead79b51671529fe7
Component: engine
2015-05-07 17:00:26 -07:00
13d096f3f5
Merge pull request #12830 from Microsoft/10662-refactorforwindowsexecdriver
...
Windows: Fork execdrivers.go for Windows execdriver
Upstream-commit: 67c10e762e1227c845e098af83afe5a8faaaf8c3
Component: engine
2015-05-07 16:57:59 -07:00
0af54ca869
Merge pull request #12952 from sunyuan3/trunc
...
Verify the no-trunc option for the search operation
Upstream-commit: 0ed20135904b079a1ff8505c3247cf7ca158f826
Component: engine
2015-05-07 16:52:46 -07:00
20e9b6f15f
Merge pull request #12961 from hqhq/hq_remove_err_out
...
a few cleanups for client output
Upstream-commit: 372977148dffe11bc0fee395dfd85dc86a558999
Component: engine
2015-05-07 16:51:56 -07:00
0e34dc7fca
Merge pull request #12970 from tianon/frozen-user-images
...
Allow download-frozen-image.sh to work on user images too
Upstream-commit: 6a4c219615e10a6719bea9ef4a71e00b42fd42a1
Component: engine
2015-05-07 16:50:49 -07:00
5a7855d50e
Merge pull request #12976 from Microsoft/10662-graphfirstchange
...
Windows: First fix for graph\graph.go
Upstream-commit: d34abea15b1e82c6c1b8a3dc8ab23097a6dae953
Component: engine
2015-05-07 16:50:20 -07:00
8b63746cd9
Merge pull request #12986 from psankar/master
...
Added information about mailing lists
Upstream-commit: b1572fd0a412df86e2ac24ee8345baf9ce6762b9
Component: engine
2015-05-07 16:49:14 -07:00
2e6e1769a6
Update "hack/vendor.sh" to be more explicit
...
Previously, we've taken advantage of the fact that libcontainer's `update-vendor.sh` is the same syntax as Docker's `vendor.sh` with some shell magic. This changes that to copy libcontainer's dependencies into this file explicitly so that we can scale to more projects with varying methods of vendoring (assuming they don't use import re-writing, which screws up everyone).
We'll need to stay diligent in making sure this list matches what's in libcontainer's `update-vendor.sh` (minus the not-required codegangsta/cli dep), but that's a fair trade-off for being able to scale our dependency model better (and track new discrete dependencies more directly).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: b919dee8347a47763d576136254bcbc922ef4c57
Component: engine
2015-05-07 17:43:11 -06:00
eb6a693474
Merge pull request #13032 from jfrazelle/nano-nano-nano
...
add nanorc to packaged builds
Upstream-commit: 6a1f862e40001b3389970b57ea38f718d4748881
Component: engine
2015-05-07 17:35:03 -06:00
1d2b89b8ee
Merge pull request #13062 from Microsoft/10662-nativedriver
...
Fix os.MkdirAll in native driver
Upstream-commit: b4dc101d746e657ab84547ae28d41d86fb6e4d34
Component: engine
2015-05-07 16:34:31 -07:00
260671a89b
Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt
...
Fix error prompt for pull & import handler postImagesCreate.
Upstream-commit: 404412282dc917b4e810f71a996656ebdc048b3b
Component: engine
2015-05-07 16:27:15 -07:00
159968801d
Merge pull request #13065 from tianon/fix-build-deb-tilde-expansion
...
Fix '~' expansion in build-deb... (properly this time)
Upstream-commit: b6448f25f2fda3518d36b5a49fd67064cff2c952
Component: engine
2015-05-07 16:24:33 -07:00
