diff options
| author | Ivan Topolnak <itopolnak@despegar.com> | 2014-01-13 17:56:51 -0300 |
|---|---|---|
| committer | Ivan Topolnak <itopolnak@despegar.com> | 2014-01-13 17:56:51 -0300 |
| commit | 111ea55690351d0903e9902c525c781ef2d743a8 (patch) | |
| tree | 003b0e1cf95f1d3cba55927422ff063c049a5cf9 /kamon-dashboard/src | |
| parent | 571e96665bb3cb3f20fb59209be63dabbb3148f4 (diff) | |
| parent | 7a10c0ef2a6566229e8571f6d385ca2ff794cc20 (diff) | |
| download | Kamon-111ea55690351d0903e9902c525c781ef2d743a8.tar.gz Kamon-111ea55690351d0903e9902c525c781ef2d743a8.tar.bz2 Kamon-111ea55690351d0903e9902c525c781ef2d743a8.zip | |
Merge branch 'wip/trace-and-metrics-integration'
Conflicts:
kamon-newrelic/src/main/scala/kamon/newrelic/NewRelicErrorLogger.scala
Diffstat (limited to 'kamon-dashboard/src')
| -rw-r--r-- | kamon-dashboard/src/main/scala/kamon/dashboard/DashboardService.scala | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kamon-dashboard/src/main/scala/kamon/dashboard/DashboardService.scala b/kamon-dashboard/src/main/scala/kamon/dashboard/DashboardService.scala index d092a947..f02bd31f 100644 --- a/kamon-dashboard/src/main/scala/kamon/dashboard/DashboardService.scala +++ b/kamon-dashboard/src/main/scala/kamon/dashboard/DashboardService.scala @@ -21,10 +21,8 @@ import spray.routing.directives.LogEntry import akka.event.Logging import spray.http.MediaTypes._ import spray.httpx.SprayJsonSupport -import kamon.Kamon import spray.http.HttpRequest import akka.actor.OneForOneStrategy -import com.codahale.metrics.{ Metric, MetricFilter } class DashboardServiceActor extends Actor with DashboardService { |