Merge branch 'fixBugOnSingleDataInRedis'
set control version to 1 in webcore and pyperfstore packages
template regex mistake
Merge branch 'bugfixes'
Merge branch 'bugfixes' into develop
updated redis configuration to make filldb init working and define perfstore behavior
typo / configuration error
fix: adapt time values from python timestamp to javascript timestamp in trends
Merge branch 'bugfixes'
Merge branch 'master' into bugfixes
fixed float value in rotate process
Merge branch 'bugfixes'
Merge branch 'bugfixes' into develop
Merge branch 'master' into develop
collectd with amqp lib compatiblity ok
take back librabit mq in externals
add: SLA view bases
Merge branch 'develop' of github.com:capensis/canopsis into develop
improve: SLA configuration window finished
Merge branch 'engine-acknowledgement' into develop