From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 24 Apr 2014 11:44:57 +0000 (+0000)
Subject: Merge "vmware: Remove deprecation warning from VC driver"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=55871c60d1df42c0a69527002aeb661fa364f20c;p=openstack-build%2Fcinder-build.git

Merge "vmware: Remove deprecation warning from VC driver"
---

55871c60d1df42c0a69527002aeb661fa364f20c
diff --cc cinder/volume/drivers/vmware/vmdk.py
index e29f1c5fc,476d596f5..a57e8e0fa
--- a/cinder/volume/drivers/vmware/vmdk.py
+++ b/cinder/volume/drivers/vmware/vmdk.py
@@@ -1104,8 -1115,13 +1104,12 @@@ class VMwareVcVmdkDriver(VMwareEsxVmdkD
      # PBM is enabled only for VC versions 5.5 and above
      PBM_ENABLED_VC_VERSION = dist_version.LooseVersion('5.5')
  
+     def _do_deprecation_warning(self):
+         # no deprecation warning for vCenter vmdk driver
+         pass
+ 
      def __init__(self, *args, **kwargs):
          super(VMwareVcVmdkDriver, self).__init__(*args, **kwargs)
 -        self.configuration.append_config_values(spbm_opts)
          self._session = None
  
      @property