Guillaume J. Charmes fcd3746eaa Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit ...

merge existing config when committing
Upstream-commit: db1afee3f023957adf43a4e9a565568e11e81d2d
Component: engine

2014-03-12 17:49:11 -07:00

..

api_test.go

Move runtime and container into sub pkg

2014-03-09 23:03:40 -07:00

auth_test.go

Merge auth package within registry

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

buildfile_test.go

Move image into sub pkg

2014-03-09 22:59:29 -07:00

commands_test.go

don't leave empty cidFile behind

2014-03-12 19:36:19 +02:00

container_test.go

Remove container env var from libcontainer

2014-02-24 21:51:00 -08:00

graph_test.go

Move graph and tags to graph sub pkg

2014-03-09 22:59:29 -07:00

iptables_test.go

Move utility package 'iptables' to pkg/iptables

2014-01-06 15:41:24 -08:00

runtime_test.go

Move runtime and container into sub pkg

2014-03-09 23:03:40 -07:00

server_test.go

Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit

2014-03-12 17:49:11 -07:00

sorter_test.go

remove some mkServerFromEngine

2014-01-31 03:34:50 +00:00

utils_test.go

Move runtime and container into sub pkg

2014-03-09 23:03:40 -07:00

z_final_test.go

Move integration tests to integration/, expose missing public methods in the core

2013-11-14 10:50:00 -08:00