diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-05-09 15:36:16 +0200 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-05-09 15:36:16 +0200 |
| commit | 76f503b8f954e1b149bea3adb8927704f7095876 (patch) | |
| tree | 59cabc6055e855c006115c5847a85f879dc36dd9 /kamon-akka-remote/src/main/java | |
| parent | 520895a6a9a6b48b83efe01cf289708efd045b42 (diff) | |
| parent | d69f14710b1d933d58412edd63b465b13a09a9d0 (diff) | |
| download | Kamon-76f503b8f954e1b149bea3adb8927704f7095876.tar.gz Kamon-76f503b8f954e1b149bea3adb8927704f7095876.tar.bz2 Kamon-76f503b8f954e1b149bea3adb8927704f7095876.zip | |
Merge branch 'master' into release-legacy-akka-2.2
Conflicts:
kamon-akka/src/test/scala/kamon/akka/RouterMetricsSpec.scala
kamon-akka/src/test/scala/kamon/akka/instrumentation/ActorCellInstrumentationSpec.scala
kamon-akka/src/test/scala/kamon/akka/instrumentation/AskPatternInstrumentationSpec.scala
kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala
kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala
kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.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/RequestInstrumentationSpec.scala
project/Dependencies.scala
project/Settings.scala
Diffstat (limited to 'kamon-akka-remote/src/main/java')
0 files changed, 0 insertions, 0 deletions