8cc93856e3
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
2015-05-11 13:18:29 -07:00
c6e6223ed7
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-11 21:50:47 +02:00
e66ad40c4e
Merge pull request #12994 from Microsoft/10662-fixinvocation
...
Windows: Fix builder\dispatchers.go
2015-05-11 11:24:43 -07:00
5e063326a3
Merge pull request #13101 from bharaththiruveedula/13092-remove-unwanted-locks
...
Removing extra locks for Pause and Unpause functions
2015-05-11 10:54:39 -07:00
92344602ea
Merge pull request #13091 from LK4D4/generate_caps
...
Generate caps
2015-05-11 10:42:59 -07:00
4d6720bfbb
Merge pull request #13111 from gianlucaborello/fix-mac-documentation
...
Correctly document MAC address generation
2015-05-10 13:43:27 -04:00
13064646a6
Merge pull request #13102 from duglin/MissingOK
...
Add missing "ok" on "comma ok" idiom in test util
2015-05-10 09:22:44 -07:00
e324f51e5b
Default MAC address generation is not random and should be stated in the documentation.
...
Signed-off-by: Gianluca Borello <g.borello@gmail.com>
2015-05-10 08:11:26 -07:00
8c1ef5ceaf
Removing extra locks for Pause and Unpause functions
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com>
2015-05-10 00:16:54 +05:30
340fd140e6
Merge pull request #12988 from Mashimiao/remove-unused-container-functions
...
cleanup: remove unneeded locks
2015-05-09 09:42:27 -07:00
c5710c7318
Merge pull request #13093 from tianon/writeflusher
...
Move WriteFlusher out of utils into ioutils
2015-05-09 09:39:17 -07:00
61cb6012e6
Merge pull request #13095 from Microsoft/10662-pkgrexec
...
Windows: reexec pkg supported
2015-05-09 09:38:42 -07:00
dd4693f67c
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>
2015-05-09 05:56:10 -07:00
7699cee247
Merge pull request #12180 from Mashimiao/add-cpuperiod-and-cpuquota-support
...
add cpu.cfs_period_us support
2015-05-08 22:32:09 -04:00
bcc24ec8ad
cleanup remove unneeded locks
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-09 10:06:53 +08:00
dccb8b5c33
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-09 10:02:46 +08:00
64715c4f33
Windows: reexec pkg supported
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-08 14:15:53 -07:00
4d2f6fbde0
Windows: Fix builder\dispatchers.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-08 11:45:08 -07:00
3697dddc0d
Merge pull request #12978 from Microsoft/10662-containerexeccreate
...
Windows: Split ContainerExecCreate
2015-05-08 11:38:03 -07:00
223d6de728
Move WriteFlusher out of utils into ioutils
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-08 12:33:33 -06:00
a559c1145a
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>
2015-05-08 09:40:05 -07:00
5a2d592c27
Update github.com/syndtr/gocapability to 66ef2aa7a23ba682594e2b6f74cf40c0692b49fb
...
It adds List function for listing all supported caps
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-05-08 09:22:37 -07:00
23abd51ef1
Merge pull request #13071 from tianon/explicit-vendor
...
Update "hack/vendor.sh" to be more explicit
2015-05-08 08:22:17 -07:00
af9dac9627
Merge pull request #13069 from runcom/dry-run-test
...
API tests - Container create with Hostname, Domainname and Network
2015-05-07 22:07:41 -04:00
fe3becee34
Merge pull request #12422 from wlan0/logopts
...
add log opts flag to pass in logging options
2015-05-07 18:10:04 -07:00
b94107c4d8
Merge pull request #13080 from jfrazelle/fix-tests-where-requires-libcontainerr-security
...
fix lxc because it doesnt have the hardened libcontainer stuff
2015-05-07 18:07:27 -07:00
128a07b512
Merge pull request #13027 from runcom/fix-typo-reference-remote-api
...
Fix typo in the api remote reference for links
2015-05-07 17:53:21 -07:00
52118df432
fix lxc because it doesnt have the hardened libcontainer stuff
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-07 17:40:37 -07:00
47fbe76a7e
Merge pull request #13077 from duglin/MoveCommands
...
Make list of commands for help less static
2015-05-07 17:35:54 -07:00
6b6a26c769
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
2015-05-07 17:13:32 -07:00
de32f5c431
Merge pull request #11802 from hqhq/hq_add_blkio_weight
...
add blkio.weight support
2015-05-07 17:10:39 -07:00
982402f4e0
Merge pull request #11831 from cellpjs/patch-1
...
Remove mkimage-unittest.sh
2015-05-07 17:07:56 -07:00
e03ac8d5b9
Merge pull request #12175 from dqminh/fix-allocate-port
...
#12148 : sort ports mapping before allocating
2015-05-07 17:04:20 -07:00
f6fa579d52
Merge pull request #12270 from burnison/11294-shortidfallback
...
Only use fallback to short IDs when obvious.
2015-05-07 17:02:58 -07:00
d0bc0153c6
Merge pull request #12278 from duglin/12267-Wildcards
...
Fix for Daemon crashing when wildcards are used for COPY/ADD
2015-05-07 17:01:16 -07:00
d0cbaeb0d2
Merge pull request #12318 from aarondav/best-effort-iptables-lock
...
Do our best not to invoke iptables concurrently if --wait is unsupported
2015-05-07 17:00:26 -07:00
67c10e762e
Merge pull request #12830 from Microsoft/10662-refactorforwindowsexecdriver
...
Windows: Fork execdrivers.go for Windows execdriver
2015-05-07 16:57:59 -07:00
0ed2013590
Merge pull request #12952 from sunyuan3/trunc
...
Verify the no-trunc option for the search operation
2015-05-07 16:52:46 -07:00
372977148d
Merge pull request #12961 from hqhq/hq_remove_err_out
...
a few cleanups for client output
2015-05-07 16:51:56 -07:00
6a4c219615
Merge pull request #12970 from tianon/frozen-user-images
...
Allow download-frozen-image.sh to work on user images too
2015-05-07 16:50:49 -07:00
d34abea15b
Merge pull request #12976 from Microsoft/10662-graphfirstchange
...
Windows: First fix for graph\graph.go
2015-05-07 16:50:20 -07:00
b1572fd0a4
Merge pull request #12986 from psankar/master
...
Added information about mailing lists
2015-05-07 16:49:14 -07:00
b919dee834
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>
2015-05-07 17:43:11 -06:00
6a1f862e40
Merge pull request #13032 from jfrazelle/nano-nano-nano
...
add nanorc to packaged builds
2015-05-07 17:35:03 -06:00
b4dc101d74
Merge pull request #13062 from Microsoft/10662-nativedriver
...
Fix os.MkdirAll in native driver
2015-05-07 16:34:31 -07:00
404412282d
Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt
...
Fix error prompt for pull & import handler postImagesCreate.
2015-05-07 16:27:15 -07:00
b6448f25f2
Merge pull request #13065 from tianon/fix-build-deb-tilde-expansion
...
Fix '~' expansion in build-deb... (properly this time)
2015-05-07 16:24:33 -07:00
b4e8942367
Merge pull request #13076 from LK4D4/fix_api_daemon_order
...
Fix api servers creation and daemon start order
2015-05-07 16:23:44 -07:00
4f00b1020e
Make list of commands for help less static
...
Before this PR the list of commands that were printed for the help
text was statically put into the flags.Usage() function via main.init(). This
made it impossible to modify later on when we add new commands
via plugins.
This PR moves the list of commands (name & description) into a structure
that is sorted and printed dynamically by the Usage func. This will allow
the code to add to the list of commands after the init() func is done
but before the help text is printed for the user.
This just moves code around - it should have no UX impact at all.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-07 16:22:06 -07:00
23193efd93
Merge pull request #13073 from jfrazelle/add_1.6.1_commits
...
Add 1.6.1 commits
2015-05-07 16:17:53 -07:00
Jessie Frazelle
Antonio Murdaca
Michael Crosby
Alexander Morozov
Sebastiaan van Stijn
Gianluca Borello
Bharath Thiruveedula
Doug Davis
Ma Shimiao
John Howard
Tianon Gravi
Alexander Morozov
Brian Goff
Michael Crosby
Jessica Frazelle
David Calavera