Netflix/zuul — pull request #48 by mattrjacobs (2014-08-28 06:44:42+00:00)
Title: Added Servo wiring for Zuul global metrics

Conflicts:
zuul-core/src/main/java/com/netflix/zuul/StartServer.java
zuul-core/src/main/java/com/netflix/zuul/filterstore/ClassPathFilterStore.java
zuul-core/src/main/java/com/netflix/zuul/filterstore/FileSystemPollingFilterStore.java
zuul-core/src/main/java/com/netflix/zuul/filterstore/FilterStore.java
zuul-core/src/main/java/com/netflix/zuul/filterstore/InMemoryFilterStore.java