Guillaume J. Charmes 1ea14534fa Merge branch 'master' into load-profile ...

Conflicts:
	daemon/execdriver/native/create.go
	daemon/execdriver/native/driver.go

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 813cebc64fb4b628e2938405d86144060c330eb9
Component: engine

2014-04-21 10:32:13 -07:00

..

execdriver

Merge branch 'master' into load-profile

2014-04-21 10:32:13 -07:00

graphdriver

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

networkdriver

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

container_unit_test.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

container.go

Remove IsGhost checks around networking

2014-04-17 23:49:59 +00:00

daemon_aufs.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

daemon_btrfs.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

daemon_devicemapper.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

daemon_no_aufs.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

daemon.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

history.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

network_settings.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

server.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

sorter.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

state.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

utils_test.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

utils.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00

volumes.go

Rename runtime/* to daemon/*

2014-04-17 14:43:01 -07:00