From eef1c4ffc5d3d9acfe331d63c3b44cdd60ec349e Mon Sep 17 00:00:00 2001 From: Diego Date: Thu, 3 Apr 2014 22:40:49 -0300 Subject: + site: added changelog and license views --- LICENSE | 2 +- .../scala/kamon/statsd/StatsDMetricsSender.scala | 4 ++-- site/src/main/jekyll/_includes/navigation-bar.html | 9 +++++++- site/src/main/jekyll/changelog.md | 22 ++++++++++++++++++ site/src/main/jekyll/license.md | 27 ++++++++++++++++++++++ 5 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 site/src/main/jekyll/changelog.md create mode 100644 site/src/main/jekyll/license.md diff --git a/LICENSE b/LICENSE index 75a68759..1f48b3d5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ This software is licensed under the Apache 2 license, quoted below. -Copyright © 2013 the kamon project +Copyright © 2013-2014 the kamon project 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 diff --git a/kamon-statsd/src/main/scala/kamon/statsd/StatsDMetricsSender.scala b/kamon-statsd/src/main/scala/kamon/statsd/StatsDMetricsSender.scala index cfc228d3..63b1a53a 100644 --- a/kamon-statsd/src/main/scala/kamon/statsd/StatsDMetricsSender.scala +++ b/kamon-statsd/src/main/scala/kamon/statsd/StatsDMetricsSender.scala @@ -16,14 +16,14 @@ package kamon.statsd -import akka.actor.{ ActorLogging, Props, ActorRef, Actor } +import akka.actor.{ Props, ActorRef, Actor } import akka.io.{ Udp, IO } import java.net.InetSocketAddress import akka.util.ByteString import kamon.Kamon import scala.annotation.tailrec -class StatsDMetricsSender extends Actor with ActorLogging { +class StatsDMetricsSender extends Actor { import context.system val statsDExtension = Kamon(StatsD) diff --git a/site/src/main/jekyll/_includes/navigation-bar.html b/site/src/main/jekyll/_includes/navigation-bar.html index d104d058..911b5f67 100644 --- a/site/src/main/jekyll/_includes/navigation-bar.html +++ b/site/src/main/jekyll/_includes/navigation-bar.html @@ -37,7 +37,14 @@
  • Mailing List
  • -
  • Acknowledgments
  • +
  • Team Blog
  • diff --git a/site/src/main/jekyll/changelog.md b/site/src/main/jekyll/changelog.md new file mode 100644 index 00000000..b95e1942 --- /dev/null +++ b/site/src/main/jekyll/changelog.md @@ -0,0 +1,22 @@ +--- +title: Kamon | Changelog +layout: default +--- + +Changelog +=============== + +Version 0.0.15 (2014-04-??) +---------------- + +Version 0.0.14 (2014-03-17) +---------------- +* kamon-core + * Improved startup times + * Remake of trace metrics collection + * Support for custom metrics collection (Experimental) +* kamon-play + * Initial support (Experimental) +* kamon-documentation + * logging (WIP) + * tracing (WIP) \ No newline at end of file diff --git a/site/src/main/jekyll/license.md b/site/src/main/jekyll/license.md new file mode 100644 index 00000000..8b75f507 --- /dev/null +++ b/site/src/main/jekyll/license.md @@ -0,0 +1,27 @@ +--- +title: Kamon | License +layout: default +--- + +License +=============== + +``` + + This software is licensed under the Apache 2 license, quoted below. + + Copyright © 2013-2014 the kamon project + + 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. + +``` -- cgit v1.2.3