47845 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Guillaume Hain	4e4516da6a	Merge branch 'master' into linux-support	2015-12-01 11:36:42 +01:00
Guillaume Hain	5f1b34ff92	Merge pull request #6 from docker/master ... Merge upstream master	2015-12-01 11:34:17 +01:00
Victor Vieux	d295d4b323	update compose to 1.5.1 ... Signed-off-by: Victor Vieux <vieux@docker.com>	2015-12-01 02:27:50 -08:00
Jean-Laurent de Morlhon	cf85b11344	Merge pull request #2463 from xiaohui/doc/ucloud-driver-reference ... Add UCloud driver	2015-12-01 10:45:21 +01:00
Xiaohui Liu	69fcbb8505	Add UCloud driver ... Signed-off-by: Xiaohui Liu <xiaohui.liu@ucloud.cn>	2015-12-01 17:40:49 +08:00
David Gageot	f0757312e5	Merge pull request #2461 from frapposelli/fusion-mount-id-fix ... Add id/gid option to mount when using vmhgfs	2015-12-01 10:33:46 +01:00
Vincent Demeester	657085dfdb	Merge pull request #18198 from aditirajagopal/16756-docker_api_inspect_test ... Checkers on docker_api_inspect_test.go	2015-12-01 09:56:01 +01:00
David Gageot	c0478b8dc7	Merge pull request #2462 from nathanleclaire/bump_v_0.5.3-dev ... Update to v0.5.3-dev	2015-12-01 09:19:49 +01:00
Nathan LeClaire	00cb219dd9	Update to v0.5.3-dev ... Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>	2015-11-30 23:58:40 -08:00
Nathan LeClaire	0456b9fc8f	Merge pull request #2460 from nathanleclaire/bump_v0.5.2 ... Bump to version 0.5.2	2015-11-30 21:59:00 -08:00
Fabio Rapposelli	40aab51e6a	Add id/gid option to mount when using vmhgfs ... Signed-off-by: Fabio Rapposelli <fabio@vmware.com>	2015-12-01 05:47:37 +01:00
Sven Dowideit	9ec49c04fd	TOC for configuration page incorrect ... Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>	2015-12-01 14:07:55 +10:00
David Calavera	d7117a1b71	Make sure container start doesn't make the DNS fields nil. ... Signed-off-by: David Calavera <david.calavera@gmail.com>	2015-11-30 22:46:31 -05:00
David Lawrence	8292d1866d	Merge pull request #299 from docker/server-parsing-trust ... Fixed bug parsing trust service info in notary server.	2015-11-30 19:31:13 -08:00
Shuwei Hao	6295345005	Modify docker volume inspect to return existed volumes ... Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>	2015-12-01 01:43:02 +00:00
Ying Li	870fe0fd01	Define injected function types for notary-server/main.getTrustService ... Signed-off-by: Ying Li <ying.li@docker.com>	2015-11-30 17:24:28 -08:00
Ying Li	1dd04d4e5d	trust_service is now a required section of the notary-server config. ... The type must either be "local" or "remote". Previously, any invalid configuration would default to a local signing service, but since a remote signing service is recommended, the user has to specifically configure a local signing service. We don't want it to be the fallback. Signed-off-by: Ying Li <ying.li@docker.com>	2015-11-30 17:23:53 -08:00
Ying Li	d62ac788a3	Fixed bug parsing trust service info in notary server. ... Previously, if it wasn't a remote service, the config parser was still setting the key algorithm to be whatever was configured. Now, if we are using a local trust service, the algorithm is always ED25519. Also broke the trust parsing into its own function for testing. Signed-off-by: Ying Li <ying.li@docker.com>	2015-11-30 17:22:33 -08:00
David Lawrence	5500c81cd9	Merge pull request #304 from docker/server-signer-config ... Make the server/signer configurations more similar	2015-11-30 17:06:13 -08:00
David Lawrence	a8b376ec0f	Merge pull request #294 from endophage/remove_cryptoservice_sign ... CryptoService.Sign is now dead code. Remove it and update tests	2015-11-30 17:04:39 -08:00
Nathan LeClaire	6887e5fec2	Bump to version 0.5.2 ... Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>	2015-11-30 17:02:19 -08:00
David Lawrence	ae7459b5f2	updating commend and renaming test per comments ... Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)	2015-11-30 16:53:08 -08:00
David Lawrence	909260ff03	Merge pull request #308 from docker/pretty-print-certs ... Pretty-print certificates from the notary CLI command `notary cert list`	2015-11-30 16:52:15 -08:00
Ying Li	7153dc7463	Fix bug with keystore not getting assigned in the signer in the DB case. ... Thanks @endophage! Signed-off-by: Ying Li <ying.li@docker.com>	2015-11-30 16:41:07 -08:00
David Lawrence	1e091a0f56	CryptoService.Sign is now dead code. Remove it and update tests ... Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)	2015-11-30 16:36:34 -08:00
Ying Li	35b104beee	Move all the pretty-print functions to their own file in cmd/notary. ... Also add tests for pretty-printing and sorting targets. Signed-off-by: Ying Li <ying.li@docker.com>	2015-11-30 16:35:53 -08:00
Ying Li	1670b69a18	Pretty-print certificates from the notary CLI command notary cert list ... Signed-off-by: Ying Li <ying.li@docker.com>	2015-11-30 16:35:53 -08:00
Nathan LeClaire	f7ea3d9f19	Merge pull request #2434 from dgageot/check-after-create ... Check machine after create	2015-11-30 16:24:43 -08:00
David Calavera	1ddd4b1dcc	Merge pull request #18320 from jfrazelle/add-license-selinux ... add licence to rpm	2015-11-30 16:20:08 -08:00
David Lawrence	7c5382b256	Merge pull request #300 from docker/server-validate-timestamp-key ... Server check that the root.json's timestamp key ID is valid.	2015-11-30 15:34:18 -08:00
Ying Li	3ce5d2527c	Merge pull request #315 from SvenDowideit/move-to-docs-base-latest ... Use FROM docs/base:latest again	2015-11-30 15:24:17 -08:00
Jessica Frazelle	09d448f924	add licence to rpm ... Signed-off-by: Jessica Frazelle <acidburn@docker.com>	2015-11-30 15:19:31 -08:00
Victor Vieux	f5d21c19db	Merge pull request #1465 from mountkin/fix-1436 ... fix the panic when "ps -a" with dead containers	2015-11-30 14:54:47 -08:00
David Calavera	94997e56a9	Merge pull request #18211 from Djelibeybi/master ... Updated LICENSE file	2015-11-30 14:37:29 -08:00
Victor Vieux	de6383c4dd	Merge pull request #1448 from jimenez/timeout_default ... Changing offers timeout default to prevent other frameworks starvation	2015-11-30 14:35:09 -08:00
Jeffrey Morgan	e5ddc4d041	Merge branch 'master' of github.com:docker/kitematic	2015-11-30 14:29:48 -08:00
Jeffrey Morgan	0dd51c775e	CI: Release on tags ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-30 14:29:43 -08:00
Aditi Rajagopal	85e5b05018	Checkers on docker_api_inspect_test.go ... Applying #16756 to integration-cli/docker_api_inspect_test.go Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>	2015-11-30 16:23:46 -06:00
Ying Li	56e8d864ce	Add some standalone (does not require MySQL) configuration files for ... server and signer, and set these to be the default configuration files when running the images. Compose specifies the configuration with MySQL. Signed-off-by: Ying Li <ying.li@docker.com>	2015-11-30 14:14:16 -08:00
Jeffrey Morgan	322b17d290	Merge pull request #1199 from docker/fix-log-streaming ... Improved log performance and reliability	2015-11-30 14:12:55 -08:00
David Calavera	dc9f9d9445	Merge pull request #18216 from aditirajagopal/16756-docker_api_containers_test ... Checkers on docker_api_containers_test	2015-11-30 14:04:54 -08:00
Tianon Gravi	91c653d73a	Merge pull request #18317 from jfrazelle/fix-gopath ... fix gopath when building debs	2015-11-30 14:04:41 -08:00
Jeffrey Morgan	83b2bff850	Improved log performance and reliability ... Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>	2015-11-30 14:01:39 -08:00
Arnaud Porterie	29dbce8357	MAINTAINERS file cleanup ... First phase in cleaning up the MAINTAINERS file to make it better reflect reality by: - Removing "Operators" that have no practical role. - Removing "Subsystems" as they often are separate repositories with their own MAINTAINERS files. Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>	2015-11-30 14:00:12 -08:00
Jessica Frazelle	4935f7f500	fix gopath when building debs ... Signed-off-by: Jessica Frazelle <acidburn@docker.com>	2015-11-30 13:44:59 -08:00
Victor Vieux	b7ca0e7844	Merge pull request #1450 from jimenez/glog_enable ... Enabling glog for mesos	2015-11-30 13:40:06 -08:00
Nathan LeClaire	d18a5f62d9	Merge pull request #2459 from dgageot/remove-fake-api ... Remove duplicated test FakeApi	2015-11-30 13:01:58 -08:00
French Ben	321fedb069	Merge pull request #1241 from FrenchBen/enable-debug ... Add package option for devTools window on start	2015-11-30 12:51:20 -08:00
French Ben	d39b8235b9	Add package option for devTools window on start ... Signed-off-by: French Ben <me+git@frenchben.com>	2015-11-30 12:49:06 -08:00
Aditi Rajagopal	4bdf957c26	Checkers on docker_api_containers_test ... Applying #16756 to integration-cli/docker_api_containers_test.go Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>	2015-11-30 14:31:48 -06:00