47845 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Calavera	64a7431663	Merge pull request #13639 from tonistiigi/fix-git-escape ... Make sure git remote subdirs don't escape git root	2015-06-01 13:04:39 -07:00
Stephen J Day	84413be3c9	Break down loadManifest function into constituent parts ... Signed-off-by: Stephen J Day <stephen.day@docker.com>	2015-06-01 13:02:50 -07:00
Phil Estes	71d960d455	Merge pull request #13557 from ewindisch/apparmor-unshare-priv ... Expand unshare test to include privileged test	2015-06-01 15:43:37 -04:00
John Howard	22b195f241	Windows: Implement ReadMemInfo() ... Signed-off-by: John Howard <jhoward@microsoft.com>	2015-06-01 12:40:33 -07:00
Doug Davis	8232312c1e	Cleanup container LogEvent calls ... Move some calls to container.LogEvent down lower so that there's less of a chance of them being missed. Also add a few more events that appear to have been missed. Added testcases for new events: commit, copy, resize, attach, rename, top Signed-off-by: Doug Davis <dug@us.ibm.com>	2015-06-01 12:39:28 -07:00
Tonis Tiigi	7f7ebeffe8	Fix breakouts from git root during build ... Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com>	2015-06-01 22:10:55 +03:00
Arnaud Porterie	62afcbc6d4	Add @calavera to maintainers ... Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>	2015-06-01 12:02:12 -07:00
Alexander Morozov	24fbcffeac	Merge pull request #13560 from Microsoft/10662-statscollector ... Windows: Factor out stat collector	2015-06-01 11:39:19 -07:00
Brian Goff	d156bc9dd4	Merge pull request #13637 from LK4D4/remove_debug ... Remove useless debug message	2015-06-01 11:38:05 -07:00
Alexander Morozov	f1b59d64d2	Remove useless debug message ... Signed-off-by: Alexander Morozov <lk4d4@docker.com>	2015-06-01 11:15:15 -07:00
Olivier Gambier	59cb937dbd	Disable goverall for now ... Signed-off-by: Olivier Gambier <olivier@docker.com>	2015-06-01 10:40:52 -07:00
Aanand Prasad	2594282082	Build Python 2.7.9 in Docker image ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-06-01 17:56:15 +01:00
Aanand Prasad	8ad11c0bc8	Make sure we use Python 2.7.9 and OpenSSL 1.0.1 when building OSX binary ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-06-01 17:55:57 +01:00
Aanand Prasad	c571bb485d	Report Python and OpenSSL versions in --version output ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-06-01 17:55:31 +01:00
Brian Goff	a7005c44b5	Merge pull request #13320 from coolljt0725/add_stats_no_stream_show_cpu_usage ... Add docker stats --no-stream show cpu usage	2015-06-01 09:40:04 -07:00
Alexandre Beslic	5a4bd67db3	Put AllowStale to false in Consul Get op ... Signed-off-by: Alexandre Beslic <abronan@docker.com>	2015-06-01 09:30:43 -07:00
David Calavera	6fb454b9f0	Merge pull request #13464 from davidrjenni/10184-fix-auto-created-devices ... Fixes issue #10184.	2015-06-01 09:30:04 -07:00
Phil Estes	d37aad170f	Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental ... fix release script for experimental	2015-06-01 12:29:45 -04:00
moxiegirl	7c190b9556	Merge pull request #13523 from moxiegirl/carry-12572-fix ... Updating after the pr went through	2015-06-01 09:21:12 -07:00
Mary Anthony	3ce2797541	Updating after the pr went through ... Updating with comments. Signed-off-by: Mary Anthony <mary@docker.com>	2015-06-01 09:20:31 -07:00
John Howard	68c879406b	Windows: Factor out stat collector ... Signed-off-by: John Howard <jhoward@microsoft.com>	2015-06-01 09:11:03 -07:00
Sebastiaan van Stijn	09bfbfd74e	Merge pull request #13615 from gesellix/docs-container-create-start ... indicate HostConfig to be used for "create container"	2015-06-01 17:46:32 +02:00
Brian Goff	b445004364	Merge pull request #13390 from mrjana/cnm_integ ... Do not attempt releasing network when not attached to any network	2015-06-01 08:25:20 -07:00
Evan Hazlett	0b5a389481	fix issue with native ssh; fix tty allocation for redhat ... Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>	2015-06-01 10:08:07 -04:00
Evan Hazlett	3cd44ec4ef	Merge pull request #1277 from ggiamarchi/openstack/bug#1269 ... Openstack / Stop polling the instance when status is ERROR	2015-06-01 08:40:59 -04:00
Aanand Prasad	8eb65ed946	Merge pull request #878 from funkyfuture/versioncmd ... Enhanced version information and Docker-like version command	2015-06-01 13:36:11 +01:00
Vincent Giersch	c4a05d6c65	Dockerfile: build with the RADOS driver ... Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>	2015-06-01 10:15:53 +00:00
Vincent Giersch	3c9a2a9bac	Fix rados build, remove uuid dependency ... Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>	2015-06-01 09:57:40 +00:00
Alexandre Beslic	3f6fbb5bff	Fix CAS not working for Consul ... Signed-off-by: Alexandre Beslic <abronan@docker.com>	2015-05-31 23:17:13 -07:00
Tobias Gesellchen	16e649c589	indicate HostConfig to be used for "create container" ... Closes #13614 Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>	2015-06-01 07:04:41 +02:00
Andrea Luzzardi	e74e269bf1	Merge pull request #880 from benjaminparnell/patch-1 ... Fix small typo in leadership/README.md	2015-05-31 21:19:18 -07:00
Olivier Gambier	3073b1d9e5	Merge pull request #576 from wking/doc-link-to-filesystem.go ... docs/storagedrivers.md: Update filesystem.go -> driver.go reference	2015-05-31 20:43:04 -07:00
Olivier Gambier	88dc35b0a7	Merge pull request #545 from dmp42/contributing ... Enhance CONTRIBUTING	2015-05-31 20:14:56 -07:00
Mary Anthony	607d585adb	Updating the Introduction ... - Clarifying two types of install - Splitting out release notes - Splitting out two install methods - Adding in comments from review - Adding release notes - Updating with abronan's comments - Updating for vieux - Updating with comments and pulling bash Signed-off-by: Mary Anthony <mary@docker.com>	2015-05-31 20:13:24 -07:00
Sven Dowideit	4caa9392f8	Merge pull request #13622 from jogo/spelling ... Fix spelling mistakes in documentation	2015-06-01 11:37:48 +10:00
Jeffrey Morgan	71985eaf0f	Merge pull request #570 from kitematic/fix-terminal-clear ... Fix bug where open terminal commands would not clear	2015-05-31 18:04:56 -07:00
Olivier Gambier	780e630b55	Merge pull request #574 from philm/fix-typos ... fixed typos	2015-05-31 17:49:36 -07:00
Guillaume Giamarchi	de817cfe46	Stop polling the instance when status is ERROR ... Fix #1269 Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>	2015-06-01 00:49:23 +02:00
Guillaume Giamarchi	2b9dd68542	Handle possible error in WaitForSpecific func ... In some situations we need to be aware of errors to basically return it rather than polling again and angain until the timeout. Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>	2015-06-01 00:49:16 +02:00
Jeffrey Morgan	bd1877688d	Merge pull request #571 from kitematic/fix-scrub ... Fix bug where scrubbing system usernames would accidentally scrub entire paths	2015-05-31 15:47:41 -07:00
Jeffrey Morgan	bb66ec5a99	Merge pull request #569 from kitematic/include-compose ... Adding compose binary to kitematic	2015-05-31 15:47:27 -07:00
Ben Parnell	c744a9b600	Fix small typo in leadership/README.md ... Signed-off-by: Ben Parnell <benjaminparnell.94@gmail.com>	2015-05-31 23:36:40 +01:00
W. Trevor King	e1c553fee9	docs/storagedrivers.md: Update filesystem.go -> driver.go reference ... Catch up after 88795e0a (Lots of various golint fixes, 2014-11-17, #1) and 65b0d73c (Move storagedriver package to registry/storage/driver, 2015-02-10, #167). Signed-off-by: W. Trevor King <wking@tremily.us>	2015-05-31 15:23:31 -07:00
Joe Gordon	3d87b80b46	Fix spelling mistakes in documentation ... While reading some of the docs I noticed a few errors, so I ran misspellings (https://pypi.python.org/pypi/misspellings) on markdown files Signed-off-by: Joe Gordon <joe.gordon0@gmail.com>	2015-05-31 11:53:23 -07:00
Chanwit Kaewkasi	7725b572c2	refactor parsing to a function ... Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>	2015-06-01 00:43:52 +07:00
xiekeyang	47aa47e3f6	Feature: Web Panic Reporting via hooks ... This PR is for issue of "email after registry webapp panic" #41, improving my previous design (closed). It use self setting up hooks, to catch panic in web application. And, send email in hooks handle directly, to no use new http server and handler. Signed-off-by: xiekeyang <keyangxie@126.com>	2015-05-31 14:21:22 +00:00
Chanwit Kaewkasi	2701342a0c	fix matching image name with private repo ... Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>	2015-05-31 21:01:00 +07:00
Jeffrey Morgan	161b35fd44	Fix bug where scrubbing system usernames would accidentally scrub entire paths	2015-05-31 01:32:38 -07:00
Jeffrey Morgan	cc29437e09	Fix bug where terminal command would be printed on click Docker CLI button or Terminal into container button	2015-05-31 01:30:07 -07:00
Jeffrey Morgan	bda32c5b39	Adding compose binary to kitematic	2015-05-31 01:27:29 -07:00