Merge "Omaha #3562 jetty upgrade change for dataserver" into omaha_14.4.1

Former-commit-id: 22f24dbb13 [formerly c8c93dccf1] [formerly 22f24dbb13 [formerly c8c93dccf1] [formerly e0d861461b [formerly 96882cbdc801c37e63ca0bc1ce950cbdffd97122]]]
Former-commit-id: e0d861461b
Former-commit-id: 16ee6e44a2 [formerly 1d3c307bd8]
Former-commit-id: 419437c6bd
This commit is contained in:
Nate Jensen 2014-08-28 11:23:43 -05:00 committed by Gerrit Code Review
commit 5b03e9fa4a

View file

@ -24,7 +24,8 @@ import java.util.Arrays;
import java.util.EnumSet;
import java.util.List;
import org.eclipse.jetty.server.DispatcherType;
import javax.servlet.DispatcherType;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;