From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 10 Sep 2014 09:21:15 +0000 (+0000)
Subject: Merge "Fixed Typo - from hypens to hyphens"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cb255bbf121a84eb29f194b6e57e8bb18a117e4d;p=openstack-build%2Fcinder-build.git

Merge "Fixed Typo - from hypens to hyphens"
---

cb255bbf121a84eb29f194b6e57e8bb18a117e4d
diff --cc cinder/api/common.py
index 2cfe4ec92,7ed9797e2..ace08ec36
--- a/cinder/api/common.py
+++ b/cinder/api/common.py
@@@ -46,11 -46,10 +46,11 @@@ CONF.register_opts(api_common_opts
  LOG = logging.getLogger(__name__)
  
  
 -XML_NS_V1 = 'http://docs.openstack.org/volume/api/v1'
 +XML_NS_V1 = 'http://docs.openstack.org/api/openstack-block-storage/1.0/content'
 +XML_NS_V2 = 'http://docs.openstack.org/api/openstack-block-storage/2.0/content'
  
  
- # Regex that matches alphanumeric characters, periods, hypens,
+ # Regex that matches alphanumeric characters, periods, hyphens,
  # colons and underscores:
  # ^ assert position at start of the string
  # [\w\.\-\:\_] match expression