From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 29 Sep 2015 10:16:30 +0000 (+0000)
Subject: Merge "Small cleanups in BaseVD/VolumeDriver"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=84083abe3a5744bf23ca7d54adb6901c9f55ad85;p=openstack-build%2Fcinder-build.git

Merge "Small cleanups in BaseVD/VolumeDriver"
---

84083abe3a5744bf23ca7d54adb6901c9f55ad85
diff --cc cinder/volume/driver.py
index afce7a336,79cc69152..80437c14e
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@@ -322,12 -292,11 +322,13 @@@ class BaseVD(object)
              self.configuration.append_config_values(volume_opts)
              self.configuration.append_config_values(iser_opts)
              utils.setup_tracing(self.configuration.safe_get('trace_flags'))
 -        self.set_execute(execute)
 +
 +        self._execute = execute
          self._stats = {}
+         self._throttle = None
  
          self.pools = []
 +        self.capabilities = {}
  
          # We set these mappings up in the base driver so they
          # can be used by children