[incubator-skywalking] 02/02: Merge branch 'master' into webapp/proxy

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a commit to branch webapp/proxy
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git

commit 565e708e57bb229ebef7984a93e05745bee003d7
Merge: 62f46ed 1328d1a
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Sun Oct 28 17:29:59 2018 +0800

    Merge branch 'master' into webapp/proxy

 .../main/java/org/apache/skywalking/apm/webapp/proxy/MvcConfig.java    | 3 ---
 1 file changed, 3 deletions(-)

diff --cc apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/MvcConfig.java
index a3a7729,81c40ba..e3d1322
--- a/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/MvcConfig.java
+++ b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/MvcConfig.java
@@@ -23,9 -22,8 +22,7 @@@ import java.io.IOException
  import java.util.Arrays;
  import org.springframework.context.annotation.Configuration;
  import org.springframework.core.io.Resource;
--import org.springframework.web.servlet.config.annotation.EnableWebMvc;
  import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
- import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
  import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
  import org.springframework.web.servlet.resource.PathResourceResolver;