Merge pull request #21033 from nikhiljindal/swaggerspecInGenericServer

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-14 11:39:56 -08:00
4 changed files with 45 additions and 10 deletions

View File

@@ -153,11 +153,6 @@ func New(c *Config) (*Master, error) {
}
m.InstallAPIs(c)
// TODO: Move this to generic api server.
if c.EnableSwaggerSupport {
m.InstallSwaggerAPI()
}
// TODO: Attempt clean shutdown?
if m.enableCoreControllers {
m.NewBootstrapController().Start()