379340b Update to upstream 2.1.0

Authored and Committed by Pete Zaitcev 9 years ago
    Update to upstream 2.1.0
    
    Updated patches from master-patches, with the only changes in the
    handling of docs:
     - use a cherry-picked upstream patch to get rid of intersphinx
     - use oslo.sphinx (please don't use sed for stuff like this, guys)
    
        
file modified
+1 -0
file modified
+8 -2
file modified
+1 -1