Jessica Frazelle 02f274f524 Fix conflicts. ...

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: fd831b4c5e50a3f1de8eb506016ffe89d5cac8d4
Component: engine

2014-12-11 17:14:53 -08:00

..

auth_test.go

Merge auth package within registry

2014-03-10 17:16:58 -07:00

auth.go

registry: fix ServerAddress setting

2014-11-24 18:26:41 +00:00

endpoint_test.go

registry: parse INDEXSERVERADDRESS into a URL for easier check in isSecure

2014-11-14 14:20:19 -08:00

endpoint.go

Add the possibility of specifying a subnet for --insecure-registry

2014-11-14 14:20:19 -08:00

httpfactory.go

registry.Registry -> registry.Session

2014-08-13 09:27:43 -04:00

MAINTAINERS

update go import path and libcontainer

2014-07-24 22:19:50 +00:00

registry_mock_test.go

Add the possibility of specifying a subnet for --insecure-registry

2014-11-14 14:20:19 -08:00

registry_test.go

Add the possibility of specifying a subnet for --insecure-registry

2014-11-14 14:20:19 -08:00

registry.go

Fix conflicts.

2014-12-11 17:14:53 -08:00

service.go

registry: refactor registry.IsSecure calls into registry.NewEndpoint

2014-11-14 14:05:31 -08:00

session_v2.go

Use logrus everywhere for logging

2014-10-24 15:03:06 -07:00

session.go

Refactor put image function's redirect loop

2014-12-10 18:11:27 -08:00

types.go

Update manifest format to rename blobsums and use arrays of dictionaries

2014-10-10 16:04:29 -07:00