search

naemon / naemon-livestatus

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

Feature/sync with upstream #24

Closed mattiasr closed 6 years ago

mattiasr commented 6 years ago

Our local repo was not in sync with upstream since @sni did some merges to upstream.

This PR will make them both in sync again.

mattiasr commented 6 years ago

@sni can you check why we get apt-get errors?

sni commented 6 years ago

I will have a look. Could you please meanwhile rebase your changes on latest HEAD?

mattiasr commented 6 years ago

rebased

sni commented 6 years ago

Thanks, looks much better now.

mattiasr commented 6 years ago

@sni can you please look at the travis builds if we can get the apt problems solved. I only have one week left at OP5, and would like to sort this before :)

sni commented 6 years ago

i cannot promise anything, i am on vacation already and have barely time. i will try to have a look.

sni commented 6 years ago

please review and merge #26, this should do the trick.

jacobbaungard commented 6 years ago

Closing due to: https://github.com/naemon/naemon-livestatus/pull/34