5e6e756 Merge --squash rpm-master

Authored and Committed by Alan Pevec 9 years ago
    Merge --squash rpm-master
    
    Conflicts:
    	.gitignore
    	0001-remove-runtime-dep-on-python-pbr.patch
    	0002-Move-notification-point-to-a-better-place.patch
    	openstack-nova.spec
    	sources
    
    Change-Id: I6db7641c0d7f672eab057c5f901c4eae0afe1416
    
        
file modified
+1 -37
file modified
+25 -28
file modified
+1 -1