aboutsummaryrefslogtreecommitdiff
path: root/kamon-akka-remote/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into release-0.2, kamon-play still need fixes.Ivan Topolnjak2014-11-031-1013/+427
| | | | | | | | | | | | | Conflicts: kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala project/Dependencies.scala
* + akka-remote: create a new kamon-akka-remote module, closes #99Ivan Topolnjak2014-10-241-0/+2847