aboutsummaryrefslogtreecommitdiff
path: root/kamon-playground
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2015-11-15 19:42:59 -0300
committerDiego <diegolparra@gmail.com>2015-11-15 19:42:59 -0300
commit159f43381b2f4fd3c8039af8cc7e3272e2f9d936 (patch)
treef06391f9a7f3f1e6b207ded3c06f280294f07f51 /kamon-playground
parent539b54c3b43c68ad418ca77032f557a4da3e3a59 (diff)
parentecf051478e80ba4ce6e7c8a169feefa771cc8e17 (diff)
downloadKamon-159f43381b2f4fd3c8039af8cc7e3272e2f9d936.tar.gz
Kamon-159f43381b2f4fd3c8039af8cc7e3272e2f9d936.tar.bz2
Kamon-159f43381b2f4fd3c8039af8cc7e3272e2f9d936.zip
wip: merge from master and fix some test
Diffstat (limited to 'kamon-playground')
-rw-r--r--kamon-playground/src/main/resources/application.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/kamon-playground/src/main/resources/application.conf b/kamon-playground/src/main/resources/application.conf
index b25549bf..783bbecd 100644
--- a/kamon-playground/src/main/resources/application.conf
+++ b/kamon-playground/src/main/resources/application.conf
@@ -44,5 +44,6 @@ kamon {
kamon-datadog.auto-start = yes
kamon-log-reporter.auto-start = no
kamon-system-metrics.auto-start = no
+ kamon-jmx.auto-start = yes
}
}