diff options
| author | Diego <diegolparra@gmail.com> | 2014-10-20 23:25:45 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2014-10-20 23:25:45 -0300 |
| commit | 2fab1e6bdef50932cfa01d137411847e8e05c1a2 (patch) | |
| tree | fc8d613a8d3924ee45fbce86e6144a561f522579 | |
| parent | 6fa0ae383c409cb8f70f57300d9ac993af5a3481 (diff) | |
| download | Kamon-2fab1e6bdef50932cfa01d137411847e8e05c1a2.tar.gz Kamon-2fab1e6bdef50932cfa01d137411847e8e05c1a2.tar.bz2 Kamon-2fab1e6bdef50932cfa01d137411847e8e05c1a2.zip | |
= play-example: downgrade scala version in master to 2.10.4
| -rw-r--r-- | kamon-examples/kamon-play-example/project/Build.scala | 4 | ||||
| -rw-r--r-- | kamon-log-reporter/src/main/scala/kamon/logreporter/LogReporter.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kamon-examples/kamon-play-example/project/Build.scala b/kamon-examples/kamon-play-example/project/Build.scala index 9432cdff..080ef4a5 100644 --- a/kamon-examples/kamon-play-example/project/Build.scala +++ b/kamon-examples/kamon-play-example/project/Build.scala @@ -20,7 +20,7 @@ object ApplicationBuild extends Build { ) val defaultSettings = Seq( - scalaVersion := "2.11.0", + scalaVersion := "2.10.4", resolvers ++= resolutionRepos, scalacOptions := Seq( "-encoding", @@ -35,7 +35,7 @@ object ApplicationBuild extends Build { "-Xlog-reflective-calls" )) - val kamonVersion = "0.3.4-05453bdeb54f4db8f643185c28fec34a77ef5ca9" + val kamonVersion = "0.3.4" val dependencies = Seq( "io.kamon" %% "kamon-core" % kamonVersion, diff --git a/kamon-log-reporter/src/main/scala/kamon/logreporter/LogReporter.scala b/kamon-log-reporter/src/main/scala/kamon/logreporter/LogReporter.scala index 560fe5ae..0f8313f8 100644 --- a/kamon-log-reporter/src/main/scala/kamon/logreporter/LogReporter.scala +++ b/kamon-log-reporter/src/main/scala/kamon/logreporter/LogReporter.scala @@ -216,7 +216,7 @@ class LogReporterSubscriber extends Actor with ActorLogging { .stripMargin.format( global.min, perProcessNonVoluntary.min, perProcessVoluntary.min, global.average, perProcessNonVoluntary.average, perProcessVoluntary.average, - global.max, perProcessNonVoluntary.max,perProcessVoluntary.max)) + global.max, perProcessNonVoluntary.max, perProcessVoluntary.max)) } |