Rebase from master

Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: f28230d35c19befe5d6799667f37c1362dd1b782
Component: engine
This commit is contained in:
Liron Levin
2015-12-08 19:45:22 +02:00
parent 1c96ff9a0b
commit be83c5ad37
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -41,9 +41,9 @@ type Config struct {
// Server contains instance details for the server
type Server struct {
cfg *Config
servers []*HTTPServer
routers []router.Router
cfg *Config
servers []*HTTPServer
routers []router.Router
authZPlugins []authorization.Plugin
}