Merge "vmware: Remove deprecation warning from VC driver"

diff --cc cinder/volume/drivers/vmware/vmdk.py
index e29f1c5fca0f6469f85b74f9fcac9f9bbece70e1,476d596f51d6a70527cf0bb08c58ec42ab75e80c..a57e8e0fa4f886186b0ad59f66bf7af694c8e1be
--- 1/cinder/volume/drivers/vmware/vmdk.py
--- 2/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