Merge local op5 patches #34
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Less code = less complexity. Signed-off-by: Carl Helmertz <chelmertz@op5.com>
…e-rhel5-support to master * commit '8370633860b0f348aa5d8ad1fa991c68611c038a': spec: Remove RHEL 5 python compatibility
The cucumber test cases were added as part of ci_config.yml file. MON-9120
…120-separate-cucumber-for-monitor-livestatus to master merging as it's approved. * commit 'fa67ea0f2c7421fbee4f0cf41b03620a35bd3588': Separate cucumber for monitor/livestatus The cucumber test cases were added as part of ci_config.yml file.
the callback NEBCALLBACK_TIMED_EVENT_DATA is never triggerd anymore (maybe it should be deprecated or removed), so use schedule_event instead and trigger a event every second to check if the timeperiod transitions have to be recalculated.
Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
the callback NEBCALLBACK_TIMED_EVENT_DATA is never triggerd anymore (maybe it should be deprecated or removed), so use schedule_event instead and trigger a event every second to check if the timeperiod transitions have to be recalculated.
- the underlaying virtual machines will be updated from time to time. - switch to trusty test vm
…ssh://scm.dev.op5.com:7999/monitor/livestatus into bugfix/schedule-timeperiod-transition-calculations
These are naemon internal variables. Instead we should use the variables supplied by the event object. Signed-off-by: Robin Engström <robin.engstrom@op5.com>
…le-timeperiod-transition-calculations to master * commit '7b2d4e8bc4d86679cf1cedded2c5f9a492b457df': module.c: do not use sigrestart or sigshutdown travis: do not hardcode precise release use schedule_event for calculating timeperiod transitions release 1.0.6 travis: do not hardcode precise release use schedule_event for calculating timeperiod transitions release 1.0.6
Signed-off-by: Tomas Vestelind <tomas.vestelind@op5.com>
…ild-env to master * commit 'f4f94e45bbd3e3f28e6361dccb0f79f02facb9a8': ci_config: Hardspec public_suffix to get succuessful builds
Newer versions of rack-test requires ruby 2.2, we don’t have that in EL6. Signed-off-by: Andreas Sjöholm <asjoholm@op5.com>
…ghtly-problems to master * commit 'de17089e12757193f740d60f2668aa1835ccad93': ci_config: Hardcode rack-test version for testing.
Signed-off-by: Robin Engström <robin.engstrom@op5.com>
…-ruby21-dependency to master * commit 'd4f1426cb696541d523c8ce53cc1b1330d2ab062': ci_config.yml: install poltergeist dependencies manually
…l-issue to master * commit '123add99c194e0f9f72e293a451c393ea258167c': installed libyaml
This merges patches from OP5s local repository, which has become out of sync with upstream
|
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) |
|
whatever makes sense to you, i don't care :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.