4c437c8 Merge branch 'master' of http://oss.tresys.com/git/refpolicy

Merged and Committed by dwalsh 13 years ago
37 files changed. 914 lines added. 70 lines removed.
Changelog
file modified
+3 -0
Makefile
file modified
+4 -0
build.conf
file modified
+6 -0
policy/modules/admin/alsa.if
file modified
+38 -0
policy/modules/admin/alsa.te
file modified
+1 -1
policy/modules/admin/bootloader.if
file modified
+2 -1
policy/modules/admin/bootloader.te
file modified
+3 -10
policy/modules/admin/brctl.if
file modified
+1 -0
policy/modules/admin/brctl.te
file modified
+2 -3
policy/modules/admin/consoletype.te
file modified
+8 -7
policy/modules/admin/logrotate.if
file modified
+2 -0
policy/modules/admin/logrotate.te
file modified
+1 -1
policy/modules/admin/netutils.if
file modified
+6 -0
policy/modules/admin/netutils.te
file modified
+3 -6
policy/modules/admin/quota.if
file modified
+2 -1
policy/modules/admin/quota.te
file modified
+1 -1
policy/modules/admin/rpm.if
file modified
+5 -6
policy/modules/admin/rpm.te
file modified
+10 -4
policy/modules/admin/shutdown.fc
file modified
+3 -3
policy/modules/admin/shutdown.if
file modified
+3 -2
policy/modules/admin/shutdown.te
file modified
+4 -1
policy/modules/admin/tzdata.if
file modified
+1 -0
policy/modules/admin/tzdata.te
file modified
+1 -1
policy/modules/admin/usermanage.if
file modified
+1 -5
policy/modules/admin/usermanage.te
file modified
+2 -4
policy/modules/kernel/corenetwork.te.in
file modified
+6 -1
policy/modules/roles/staff.te
file modified
+1 -1
policy/modules/roles/sysadm.te
file modified
+5 -6
policy/modules/roles/unprivuser.te
file modified
+1 -1
policy/modules/services/cyphesis.te
file modified
+1 -1
policy/modules/services/hadoop.fc
file added
+55
policy/modules/services/hadoop.if
file added
+331
policy/modules/services/hadoop.te
file added
+374
policy/modules/system/init.if
file modified
+18 -0
policy/modules/system/unconfined.te
file modified
+1 -2
policy/modules/system/userdomain.if
file modified
+7 -0
policy/modules/system/userdomain.te
file modified
+1 -1
    Merge branch 'master' of http://oss.tresys.com/git/refpolicy
    
    Conflicts:
    	policy/modules/admin/rpm.if
    	policy/modules/admin/shutdown.fc
    	policy/modules/admin/shutdown.te
    	policy/modules/kernel/corenetwork.te.in
    	policy/modules/roles/staff.te
    	policy/modules/roles/unprivuser.te
    	policy/modules/system/unconfined.te
    	policy/modules/system/userdomain.if
    
        
file modified
+3 -0
file modified
+4 -0
file modified
+6 -0
file modified
+38 -0
file modified
+1 -1
file modified
+5 -6
file modified
+10 -4
file modified
+18 -0