[nagios/f14/master: 3/3] Merge branch 'master' into f14/master

Peter Lemenkov peter at fedoraproject.org
Tue Oct 26 11:35:36 UTC 2010


commit 51d91fb5374c32b37e905ed9b21a618b00cc0bc5
Merge: e6d0b4e 909da5a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Oct 26 15:35:10 2010 +0400

    Merge branch 'master' into f14/master
    
    Conflicts:
    	nagios.spec

 .gitignore                                         |    1 +
 nagios-0001-from-rpm.patch                         |    6 +-
 nagios-0002-SELinux-relabeling.patch               |    9 +--
 nagios-0003-Fix-etc-init.d-nagios-status.patch     |    9 +--
 ...-installation-of-httpd-conf.d-config-file.patch |   25 +++++++
 nagios-0005-Install-config-files-too.patch         |   26 +++++++
 nagios.spec                                        |   77 ++++++++++----------
 sources                                            |    2 +-
 8 files changed, 102 insertions(+), 53 deletions(-)
---


More information about the scm-commits mailing list