[shinken/f20: 4/4] Merge branch 'master' into f20

[david hannequin]

commit 316d5742f58fdd5319c1ca7d462c880237383e55
Merge: f8a3e27 7d57440
Author: hvad <david.hannequin at gmail.com>
Date:   Fri Feb 13 19:36:35 2015 +0100

    Merge branch 'master' into f20

 path.cfg                    |   1 +
 shinken-arbiter.init        | 102 ++++++++++++++++++++++++++++++++++++++++
 shinken-arbiter.service     |  10 ++++
 shinken-broker.init         | 111 ++++++++++++++++++++++++++++++++++++++++++++
 shinken-broker.service      |  10 ++++
 shinken-poller.init         | 108 ++++++++++++++++++++++++++++++++++++++++++
 shinken-poller.service      |  10 ++++
 shinken-reactionner.init    | 103 ++++++++++++++++++++++++++++++++++++++++
 shinken-reactionner.service |  10 ++++
 shinken-receiver.init       | 102 ++++++++++++++++++++++++++++++++++++++++
 shinken-receiver.service    |  10 ++++
 shinken-scheduler.init      | 103 ++++++++++++++++++++++++++++++++++++++++
 shinken-scheduler.service   |  10 ++++
 shinken.spec                |  14 +++---
 14 files changed, 697 insertions(+), 7 deletions(-)
---