47845 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Victor Vieux	adda54109e	Merge pull request #571 from vieux/sort_info ... Sort docker info by name	2015-04-03 16:39:28 -07:00
Arnaud Porterie	886026f99e	Add thaJeztah ... Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>	2015-04-03 16:37:36 -07:00
Victor Vieux	820527be7e	Sort docker info by name ... Signed-off-by: Victor Vieux <victorvieux@gmail.com>	2015-04-03 16:37:27 -07:00
Huu Nguyen	d94e186442	Make NOTICE in the README into a link ... Signed-off-by: Huu Nguyen <whoshuu@gmail.com>	2015-04-03 16:36:49 -07:00
Andrea Luzzardi	c101ab7548	Merge pull request #572 from vieux/improve_docker_info ... add strategy and filters to docker info	2015-04-03 16:35:39 -07:00
Victor Vieux	805b4763f4	disable cluster flag ... Signed-off-by: Victor Vieux <victorvieux@gmail.com>	2015-04-03 16:33:48 -07:00
Victor Vieux	8f50c0eb7a	use names everywhere ... Signed-off-by: Victor Vieux <victorvieux@gmail.com>	2015-04-03 16:22:56 -07:00
Andrea Luzzardi	23d52249fa	Fix container update flow. ... This guarantees that containers get fully updated before being inserted in the node (and returned by .Containers()). Fixes #560 Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>	2015-04-03 16:21:48 -07:00
Andrea Luzzardi	b9ccbd119d	Merge pull request #567 from mgoelzer/issue564 ... Make TTL > heartbeat interval so that keys do not disappear	2015-04-03 16:06:23 -07:00
Aanand Prasad	502d58abe6	Add guide to using Compose in production ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-04-03 18:56:29 -04:00
Victor Vieux	20ec7a889e	add strategy and filters to docker info ... Signed-off-by: Victor Vieux <victorvieux@gmail.com>	2015-04-03 15:56:26 -07:00
Stephen Day	0a2affa79f	Merge pull request #311 from moxiegirl/doc-tooling-changes ... doc: retooling to allow for docs build	2015-04-03 15:39:20 -07:00
Tianon Gravi	6a99c2032e	Merge pull request #12065 from proppy/patch-14 ... test-unit: fix TESTFLAGS doc	2015-04-03 16:26:11 -06:00
Simon Eskildsen	e1ca439828	daemon: convert version log statement to fields ... Signed-off-by: Simon Eskildsen <sirup@sirupsen.com>	2015-04-03 18:22:17 -04:00
Johan Euphrosine	5846914f91	test-unit: fix TESTFLAGS doc ... Signed-off-by: Johan Euphrosine <proppy@google.com>	2015-04-03 15:05:14 -07:00
Brendan Dixon	1a36a113d4	Windows console fixes ... Corrected integer size passed to Windows Corrected DisableEcho / SetRawTerminal to not modify state Cleaned up and made routines more idiomatic Corrected raw mode state bits Removed duplicate IsTerminal Corrected off-by-one error Minor idiomatic change Signed-off-by: Brendan Dixon <brendand@microsoft.com>	2015-04-03 15:02:52 -07:00
Mary Anthony	636a19b212	Retooling to allow for docs build ... Adding docs build to the Makefile Adding in Sven's changes to the Makefile Removing DS_store file Updating per Stephen's comments Update with Stephen's final comment Signed-off-by: Mary Anthony <mary@docker.com>	2015-04-03 14:55:24 -07:00
Stephen Day	0eb50c18ea	Merge pull request #321 from stevvooe/context-reference ... context: correctly reference context object	2015-04-03 14:37:33 -07:00
Arnaud Porterie	58f07c9d8a	Rename status labels ... Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>	2015-04-03 14:33:16 -07:00
Arnaud Porterie	80f3085651	Sort maintainers alphabetically ... Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>	2015-04-03 14:33:16 -07:00
Arnaud Porterie	370cef012e	Move docs approval section ... Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>	2015-04-03 14:33:16 -07:00
Jessie Frazelle	b2fbd9e632	Merge pull request #12060 from duglin/RemoveTable3 ... Remove engine.Table from docker search and fix missing field	2015-04-03 21:29:36 +00:00
Jessie Frazelle	9cdad8a26b	Merge pull request #11886 from jamiehannaford/pkg-mnt-docs ... Document exported functions and consts in pkg/mount	2015-04-03 21:28:11 +00:00
Stephen J Day	03ed290cc9	Correctly reference context object ... Signed-off-by: Stephen J Day <stephen.day@docker.com>	2015-04-03 14:09:33 -07:00
Alexander Morozov	5c83dfe670	Merge pull request #11994 from unclejack/jsonfilelog_allocations ... daemon/logger/jsonfilelog: avoid some allocations	2015-04-03 13:58:13 -07:00
Olivier Gambier	1963b7902e	Merge pull request #312 from stevvooe/add-layer-info-cache ... registry: integrate layer info cache with registry and storage	2015-04-03 13:53:27 -07:00
Stephen Day	f5a34a009a	Merge pull request #317 from stevvooe/notification-docs ... doc: document event notification system	2015-04-03 13:49:24 -07:00
Stephen Day	d43adcd910	Merge pull request #320 from RichardScothern/docs ... doc: document storage middleware.	2015-04-03 13:48:43 -07:00
Stephen Day	aea2965636	Merge pull request #316 from stevvooe/eventual-consistency-approach ... doc: document approach to eventual consistency	2015-04-03 13:46:19 -07:00
Richard	3573c6c466	Document storage middleware.	2015-04-03 13:45:40 -07:00
Jessie Frazelle	4d571257ed	Merge pull request #12039 from ahmetalpbalkan/windows-install-docs-update ... docs: Add new windows installation tutorials	2015-04-03 20:39:21 +00:00
Evan Hazlett	d0d9aa2d47	Merge pull request #952 from ehazlett/do-fix-waitssh ... digitalocean: remove unneeded wait for ssh	2015-04-03 16:27:43 -04:00
Kristján Oddsson	584c795512	Replace hard-coded error message with props. ... Make sure that errors that happen when pulling image layers bubble up to the UI. We do this by catching errors coming from the docker client, calling the callback with that error and setting the global variable `_error` as the error we just caught. This is to make sure that when the stream ends we call the callback with the error as well as to not to over-ride it. Finally we remove the hard-coded message in the UI and display the error that gets passed in to it through the props attribute. This is the only part I'm not super sure on if we really want since it must have been set there for a reason. If I can get a re-producible test case I can make sure that it's still passing with this patch. Fixes #355. Signed-off-by: Kristján Oddsson <koddsson@gmail.com>	2015-04-03 20:15:39 +00:00
moxiegirl	fb1e10284b	Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter ... docs: fix bullet list and missing label filter	2015-04-03 12:33:22 -07:00
Fred Lifton	eb073c53f4	Merge pull request #1249 from asveepay/update_doc ... Update install docs for permission denied error	2015-04-03 12:31:38 -07:00
moxiegirl	a6c04f33e1	Merge pull request #12003 from sleinen/patch-1 ... Make explanation consistent with command	2015-04-03 12:19:37 -07:00
moxiegirl	6d5a0ac11e	Merge pull request #12057 from icecrime/11925_carry ... Specify running `boot2docker ip` on host	2015-04-03 12:11:53 -07:00
Jessie Frazelle	409ed98c3f	Merge pull request #12048 from tianon/auto-btrfs_noversion ... Change the btrfs_noversion check to be automatic	2015-04-03 19:00:57 +00:00
Jessie Frazelle	3985dc299a	Merge pull request #12054 from eluck/master ... Update userguide/dockervolumes - fixes issue #12052	2015-04-03 18:58:52 +00:00
Jessie Frazelle	3683498d6f	Merge pull request #12037 from twhiteman/master ... integration-cli: in TestPsListContainersSize, check for no containers	2015-04-03 18:52:26 +00:00
Jessie Frazelle	55da2e5987	Merge pull request #12059 from whoshuu/readme ... Clean up formatting in the README	2015-04-03 18:49:26 +00:00
Ahmet Alp Balkan	2b320a2309	docs: Add new windows installation tutorials ... Updated Windows installation documentation with newest screencasts and Chocolatey instructions to install windows client CLI. Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>	2015-04-03 11:33:34 -07:00
Doug Davis	67b4cce0f6	Remove engine.Table from docker search and fix missing field ... registry/SearchResults was missing the "is_automated" field. I added it back in. Pull this 'table' removal one from the others because it fixed a bug too Signed-off-by: Doug Davis <dug@us.ibm.com>	2015-04-03 11:27:30 -07:00
Michael Crosby	e64f6baf11	Merge pull request #12010 from ibuildthecloud/small ... Small changes from #11967 for review comments	2015-04-03 11:27:06 -07:00
Jessie Frazelle	b3e9c274dd	Merge pull request #11981 from unclejack/fix_profiler ... api/server: fix profiler HTTP serving	2015-04-03 18:25:12 +00:00
Antonio Murdaca	01724c1cf1	Refactor ultis/utils_daemon, fixes #11908 ... Signed-off-by: Antonio Murdaca <me@runcom.ninja>	2015-04-03 20:20:04 +02:00
Michael Crosby	326a5545d4	Merge pull request #12058 from duglin/RemoveTable2 ... Remove engine.Table from docker history and docker rmi	2015-04-03 10:57:52 -07:00
Roland Cooper	d866415b9a	Update install docs for permission denied error ... Signed-off-by: Roland Cooper <rcooper@enova.com>	2015-04-03 12:21:15 -05:00
Jeffrey Morgan	f063346e02	Merge pull request #356 from koddsson/master-remove-container-call-on-hover ... Remove `componentDidMount` function with reload.	2015-04-03 13:03:21 -04:00
Olivier Gambier	38b8ddbe59	Merge pull request #318 from CpuID/cpuid_fix_api_issue_link ... Fix GitHub issue link, simple typo	2015-04-03 10:02:36 -07:00