search

naemon / naemon-livestatus

Naemon - Livestatus Eventbroker Module
GNU General Public License v2.0
26 stars 30 forks source link

Merge local op5 patches #34

Closed jacobbaungard closed 6 years ago

jacobbaungard commented 6 years ago

OP5s local repo of livestatus has been out of sync for some time. This pull request is to resync everything, so the two repos are back in sync.

Unfortunately the history is a slightly messy.

jacobbaungard commented 6 years ago

OK to merge with -ff to avoid having two consecutive merge commits? Seems a bit redundant. (I tested merging with -ff here: https://github.com/jacobbaungard/naemon-livestatus/commits/master)

sni commented 6 years ago

whatever makes sense to you, i don't care :-)