Permalink
Browse files

preparing release 0.6.4

  • Loading branch information...
1 parent 72b9071 commit 1f788b74735282dfb7938caa00f93424ca0ad821 @dpsoft dpsoft committed Dec 21, 2016
View
@@ -64,7 +64,23 @@ If you have a project you'd like to include in this list, either open a PR or le
* [camel-kamon](https://github.com/osinka/camel-kamon): Kamon metrics and traces for Apache Camel routes, processors
* [kamon-play-extensions](https://github.com/agiledigital/kamon-play-extensions): Kamon extensions for use in Play2 applications.
+## License
+This software is licensed under the Apache 2 license, quoted below.
+
+Copyright © 2013-2016 the kamon project <http://kamon.io>
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+ [http://www.apache.org/licenses/LICENSE-2.0]
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations under
+the License.
[Play Framework]: https://github.com/kamon-io/kamon-play
@@ -120,7 +120,7 @@ object Kamon {
case Success(_)
val color = (msg: String) s"""\u001B[32m${msg}\u001B[0m"""
log.info(color("Kamon-autoweave has been successfully loaded."))
- log.info(color("The AspectJ loadtime weaving agent is now attached to the JVM (you don't need to use -javaagent)."))
+ log.info(color("The AspectJ load time weaving agent is now attached to the JVM (you don't need to use -javaagent)."))
log.info(color("This offers extra flexibility but obviously any classes loaded before attachment will not be woven."))
case Failure(NonFatal(reason)) log.debug(s"Kamon-autoweave failed to load. Reason: ${reason.getMessage}.")
}
@@ -17,13 +17,13 @@
package kamon.testkit
import akka.actor.ActorSystem
-import akka.testkit.{ ImplicitSender, TestKitBase }
+import akka.testkit.{ImplicitSender, TestKitBase}
import com.typesafe.config.Config
import kamon.Kamon
-import kamon.metric.{ Entity, EntitySnapshot, SubscriptionsDispatcher }
+import kamon.metric.{Entity, EntitySnapshot, SubscriptionsDispatcher}
import kamon.trace.TraceContext
import kamon.util.LazyActorRef
-import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpecLike }
+import org.scalatest.{BeforeAndAfterAll, Matchers, WordSpecLike}
abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with WordSpecLike with Matchers with ImplicitSender with BeforeAndAfterAll {
lazy val collectionContext = Kamon.metrics.buildDefaultCollectionContext

0 comments on commit 1f788b7

Please sign in to comment.