diff options
| author | Diego <diegolparra@gmail.com> | 2015-11-15 19:42:59 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2015-11-15 19:42:59 -0300 |
| commit | f671c21df6faf74de9cc19dca00f5a4e07218ea7 (patch) | |
| tree | 502e9e2ae735bf8892750564cb0190adb0fed303 /kamon-core/src/main/scala/kamon/Kamon.scala | |
| parent | ec91eede73e20fef3b694fa45009ddd0ef0b345b (diff) | |
| parent | a805a84f5bb6fd1ee1997ee2f19caa53fd4cffe9 (diff) | |
| download | Kamon-f671c21df6faf74de9cc19dca00f5a4e07218ea7.tar.gz Kamon-f671c21df6faf74de9cc19dca00f5a4e07218ea7.tar.bz2 Kamon-f671c21df6faf74de9cc19dca00f5a4e07218ea7.zip | |
wip: merge from master and fix some test
Diffstat (limited to 'kamon-core/src/main/scala/kamon/Kamon.scala')
| -rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index f2d1e319..54050c18 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -16,14 +16,11 @@ package kamon import _root_.akka.actor import _root_.akka.actor._ -import _root_.akka.event.Logging -import com.typesafe.config.{ ConfigFactory, Config } +import com.typesafe.config.{ Config, ConfigFactory } import kamon.metric._ -import kamon.trace.{ TracerModuleImpl, TracerModule } +import kamon.trace.TracerModuleImpl import org.slf4j.LoggerFactory -import _root_.scala.util.Try - object Kamon { private val log = LoggerFactory.getLogger(getClass) |