da364ca Merge --squash rpm-master

Authored and Committed by Alan Pevec 9 years ago
    Merge --squash rpm-master
    
    Conflicts:
    	.gitignore
    	0002-Add-fixes-for-building-the-doc-package.patch
    	openstack-swift.rsyslog
    	openstack-swift.spec
    	proxy-server.conf
    	sources
    
    Change-Id: Ib76d589e67b3592db8d4791e769b1ac60c6a217e
    
        
file modified
+1 -15
file modified
+16 -37
file modified
+3 -0
file modified
+1 -1