Merge remote-tracking branch 'local12x/1.2.x'

This commit is contained in:
Phillip Webb
2015-10-19 12:56:55 -07:00
573 changed files with 791 additions and 360 deletions

View File

@@ -22,6 +22,7 @@ import java.io.IOException;
import org.apache.catalina.connector.Connector;
import org.apache.coyote.http11.Http11NioProtocol;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;