[shinken/el6: 43/43] new source
david hannequin
hvad at fedoraproject.org
Fri Feb 20 12:22:32 UTC 2015
commit a0ceaa667b31c19f9a90862307b1dde789c24ec9
Merge: 330821b 9820e1e
Author: hvad <david.hannequin at gmail.com>
Date: Fri Feb 13 18:33:54 2015 +0100
new source
.gitignore | 18 +++++++++++++
shinken-admin.8shinken | 15 +++++++++++
shinken-arbiter.8shinken | 61 ++++++++++++++++++++++++++++++++++++++++++++
shinken-broker.8shinken | 57 +++++++++++++++++++++++++++++++++++++++++
shinken-discovery.8shinken | 61 ++++++++++++++++++++++++++++++++++++++++++++
shinken-poller.8shinken | 48 ++++++++++++++++++++++++++++++++++
shinken-reactionner.8shinken | 50 ++++++++++++++++++++++++++++++++++++
shinken-receiver.8shinken | 49 +++++++++++++++++++++++++++++++++++
shinken-scheduler.8shinken | 50 ++++++++++++++++++++++++++++++++++++
shinken-skonf.8shinken | 15 +++++++++++
shinken.8shinken | 55 +++++++++++++++++++++++++++++++++++++++
sources | 4 +++
12 files changed, 483 insertions(+)
---
diff --cc .gitignore
index b81c17c,b1882b7..a6e88e4
--- a/.gitignore
+++ b/.gitignore
@@@ -4,18 -4,21 +4,36 @@@
/shinken-1.2.4.tar.gz
/shinken-1.4.tar.gz
/shinken-1.4.1.tar.gz
++<<<<<<< HEAD
+/shinken-arbiter.service
+/shinken-broker.service
+/shinken-poller.service
+/shinken-reactionner.service
+/shinken-receiver.service
+/shinken-scheduler.service
++=======
+ /shinken-1.4.2.tar.gz
+ /1.4.2.tar.gz
+ /2.0.3.tar.gz
++>>>>>>> master
/shinken-arbiter.init
/shinken-broker.init
/shinken-poller.init
/shinken-reactionner.init
/shinken-receiver.init
/shinken-scheduler.init
++<<<<<<< HEAD
+/2.0.3.tar.gz
+/shinken.8shinken
+/path.cfg
++=======
+ /shinken-arbiter.service
+ /shinken-broker.service
+ /shinken-poller.service
+ /shinken-reactionner.service
+ /shinken-receiver.service
+ /shinken-scheduler.service
+ /shinken.8shinken
+ /path.cfg
+ /2.2.tar.gz
++>>>>>>> master
diff --cc sources
index e532ef4,66efa2a..81810f5
--- a/sources
+++ b/sources
@@@ -1,15 -1,1 +1,19 @@@
++<<<<<<< HEAD
+c40206b87038c8af66f8bf5ab21163a6 shinken.8shinken
+97b672fb376b441c73cf585136b5ac32 shinken-arbiter.init
+d46953b5ef611c4ddc32eb6139469435 shinken-broker.init
+d5c48cf70aaf5496ba1eaa3cf742295c shinken-poller.init
+7fdd79ef56ac5ed5f97f20cb73112532 shinken-reactionner.init
+6f816c8dc650706ca14f82c279d09b79 shinken-receiver.init
+daa1c56b46e3a7af639813116239f662 shinken-scheduler.init
+7a27dee87e1aa7d4c5091a8b2db130a8 shinken-arbiter.service
+d971d100954b1b5c0ff6cd4171bf6650 shinken-broker.service
+827e8d61d2443bf66663ae5aa14111b5 shinken-poller.service
+6583451c1e0c439375674e1dbe40f6d4 shinken-reactionner.service
+ce14b4a17e687e0b10120ca9b67f93a5 shinken-receiver.service
+34c8d400485672493f16d77504d29e0f shinken-scheduler.service
+2ea403179e257fb640b2b555598cacc4 2.0.3.tar.gz
+05b23d43b493dafb693f10d36a2f9a1c path.cfg
++=======
+ 796db5b6b439f50f91b07c75b7ec8eeb 2.2.tar.gz
++>>>>>>> master
More information about the scm-commits
mailing list