aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2014-04-02 20:39:34 -0300
committerDiego <diegolparra@gmail.com>2014-04-02 20:39:34 -0300
commitc118783884f249ced8afa85650ba53fa887a418f (patch)
treefacf3a659eb5621ed3ca5116ef4248c213ef926f
parentf887eb780270c0b7b4972a4aeeab981a34ae93b7 (diff)
parent4efbcc794fd1119bfce86c393fafbe30673c3769 (diff)
downloadKamon-c118783884f249ced8afa85650ba53fa887a418f.tar.gz
Kamon-c118783884f249ced8afa85650ba53fa887a418f.tar.bz2
Kamon-c118783884f249ced8afa85650ba53fa887a418f.zip
Merge branch 'statsd' of github.com:kamon-io/Kamon into statsd
-rw-r--r--project/Projects.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/project/Projects.scala b/project/Projects.scala
index dfc3d72d..18dfe03c 100644
--- a/project/Projects.scala
+++ b/project/Projects.scala
@@ -63,13 +63,13 @@ object Projects extends Build {
.settings(libraryDependencies ++= compile(akkaActor, akkaSlf4j, sprayRouting, sprayCan, sprayJson))
.dependsOn(kamonCore)
+
lazy val kamonTestkit = Project("kamon-testkit", file("kamon-testkit"))
.settings(basicSettings: _*)
.settings(formatSettings: _*)
.settings(libraryDependencies ++= compile(akkaActor, akkaTestKit) ++ test(slf4Api, slf4nop))
.dependsOn(kamonCore)
-
lazy val kamonPlay = Project("kamon-play", file("kamon-play"))
.settings(basicSettings: _*)
.settings(formatSettings: _*)