aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/util/MapMerge.scala
Commit message (Expand)AuthorAgeFilesLines
* = core: put the ModuleLoader back in place for auto-starting modules.Ivan Topolnjak2015-03-121-1/+1
* ! all: include license headersDiego2015-01-291-0/+16
* ! all: improve the metric recorders infrastructureIvan Topolnjak2015-01-241-0/+27