1f86dac A lot of merge fixes

Authored and Committed by mgrepl 11 years ago
68 files changed. 251 lines added. 306 lines removed.
awstats.te
file modified
+9 -10
boinc.te
file modified
+1 -2
chrome.te
file modified
+3 -2
cobbler.te
file modified
+2 -3
condor.if
file modified
+3 -0
condor.te
file modified
+1 -4
consolekit.te
file modified
+0 -3
corosync.te
file modified
+3 -2
couchdb.te
file modified
+2 -5
courier.fc
file modified
+1 -1
courier.if
file modified
+0 -43
courier.te
file modified
+0 -5
cpucontrol.te
file modified
+3 -3
cron.if
file modified
+50 -0
cron.te
file modified
+0 -5
cups.te
file modified
+2 -2
cyrus.te
file modified
+1 -1
dovecot.te
file modified
+1 -1
exim.te
file modified
+3 -3
firewallgui.te
file modified
+1 -1
ftp.te
file modified
+4 -25
git.te
file modified
+6 -15
glance.if
file modified
+3 -0
glance.te
file modified
+0 -2
glusterd.if
file modified
+2 -2
glusterd.te
file modified
+1 -1
inetd.te
file modified
+1 -1
irc.te
file modified
+0 -2
kismet.te
file modified
+4 -5
ksmtuned.te
file modified
+0 -3
ldap.te
file modified
+4 -7
likewise.if
file modified
+1 -6
likewise.te
file modified
+0 -7
mailman.if
file modified
+12 -37
mailman.te
file modified
+0 -7
mandb.te
file modified
+3 -0
mcelog.te
file modified
+2 -10
mozilla.te
file modified
+7 -12
mta.te
file modified
+2 -2
munin.if
file modified
+4 -1
munin.te
file modified
+0 -6
nagios.te
file modified
+0 -3
ncftool.te
file modified
+0 -4
nsplugin.te
file modified
+2 -1
openshift.if
file modified
+2 -2
openvpn.te
file modified
+1 -1
piranha.te
file modified
+1 -1
portmap.fc
file modified
+1 -0
postfix.if
file modified
+1 -1
procmail.te
file modified
+1 -1
pulseaudio.if
file modified
+23 -0
pulseaudio.te
file modified
+54 -4
rhcs.te
file modified
+0 -8
rsync.if
file modified
+2 -2
samhain.if
file modified
+2 -0
samhain.te
file modified
+0 -2
sandbox.if
file modified
+1 -1
sandboxX.if
file modified
+2 -2
sandboxX.te
file modified
+3 -2
sblim.if
file modified
+5 -0
sblim.te
file modified
+0 -5
shutdown.if
file modified
+1 -0
sosreport.te
file modified
+0 -1
spamassassin.te
file modified
+1 -1
squid.te
file modified
+2 -13
uucp.te
file modified
+1 -1
virt.if
file modified
+2 -2
xguest.te
file modified
+1 -1
    A lot of merge fixes
    
        
file modified
+9 -10
file modified
+1 -2
file modified
+3 -2
file modified
+2 -3
file modified
+3 -0
file modified
+1 -4
file modified
+0 -3
file modified
+3 -2
file modified
+2 -5
file modified
+1 -1
file modified
+0 -43
file modified
+0 -5
file modified
+3 -3
file modified
+50 -0
file modified
+0 -5
file modified
+2 -2
file modified
+1 -1
file modified
+1 -1
file modified
+3 -3
file modified
+1 -1
file modified
+4 -25
file modified
+6 -15
file modified
+3 -0
file modified
+0 -2
file modified
+2 -2
file modified
+1 -1
file modified
+1 -1
file modified
+0 -2
file modified
+4 -5
file modified
+0 -3
file modified
+4 -7
file modified
+1 -6
file modified
+0 -7
file modified
+12 -37
file modified
+0 -7
file modified
+3 -0
file modified
+2 -10
file modified
+7 -12
file modified
+2 -2
file modified
+4 -1
file modified
+0 -6
file modified
+0 -3
file modified
+0 -4
file modified
+2 -1
file modified
+2 -2
file modified
+1 -1
file modified
+1 -1
file modified
+1 -0
file modified
+1 -1
file modified
+1 -1
file modified
+23 -0
file modified
+54 -4
file modified
+0 -8
file modified
+2 -2
file modified
+2 -0
file modified
+0 -2
file modified
+1 -1
file modified
+2 -2
file modified
+3 -2
file modified
+5 -0
file modified
+0 -5
file modified
+1 -0
file modified
+0 -1
file modified
+1 -1
file modified
+2 -13
file modified
+1 -1
file modified
+2 -2
file modified
+1 -1