aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/util/MapMerge.scala
Commit message (Collapse)AuthorAgeFilesLines
* Prepare for the major cleanupIvan Topolnjak2017-04-241-43/+0
| | | | | | Moved all the original files from src/main to src/legacy-main, same with test files. Also removed the autoweave module, examples and bench as I'm planning to have them in separate repositories.
* wipDiego2016-12-041-1/+1
|
* = 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