aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2014-04-03 22:40:49 -0300
committerDiego <diegolparra@gmail.com>2014-04-03 22:40:49 -0300
commiteef1c4ffc5d3d9acfe331d63c3b44cdd60ec349e (patch)
tree0e6b57b65a47c417e23bf942e040bcd613ea9383
parent837332b3a3c6b354f53b75f54c0d52a25d4c80a7 (diff)
downloadKamon-eef1c4ffc5d3d9acfe331d63c3b44cdd60ec349e.tar.gz
Kamon-eef1c4ffc5d3d9acfe331d63c3b44cdd60ec349e.tar.bz2
Kamon-eef1c4ffc5d3d9acfe331d63c3b44cdd60ec349e.zip
+ site: added changelog and license views
-rw-r--r--LICENSE2
-rw-r--r--kamon-statsd/src/main/scala/kamon/statsd/StatsDMetricsSender.scala4
-rw-r--r--site/src/main/jekyll/_includes/navigation-bar.html9
-rw-r--r--site/src/main/jekyll/changelog.md22
-rw-r--r--site/src/main/jekyll/license.md27
5 files changed, 60 insertions, 4 deletions
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 <http://kamon.io>
+Copyright © 2013-2014 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
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 @@
<li><a tabindex="-1" href="https://groups.google.com/forum/#!forum/kamon-user"><i class="fa fa-google-plus"></i> Mailing List</a></li>
</ul>
</li>
- <li><a href="/acknowledgments/">Acknowledgments</a></li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="project-info">Project Info <span class="caret"></span></a>
+ <ul class="dropdown-menu" aria-labelledby="download">
+ <li><a tabindex="-1" href="/acknowledgments/"><i class="fa fa-thumbs-up"></i> Acknowledgments</a></li>
+ <li><a tabindex="-1" href="/changelog/"><i class="fa fa-code-fork"></i> Changelog</a></li>
+ <li><a tabindex="-1" href="/license/"><i class="fa fa-info-circle"></i> License</a></li>
+ </ul>
+ </li>
<li><a href="/teamblog/">Team Blog</a></li>
</ul>
</div>
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 <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.
+
+```