Merge "Use openstack.common.notifier."

diff --cc cinder/exception.py
Simple merge

diff --cc cinder/flags.py
Simple merge

diff --cc cinder/utils.py
Simple merge

diff --cc etc/cinder/cinder.conf.sample
index 803ccb1fc0a8671fe8dc0cd8358e889302866a78,9a382e5dc0692f952d48ee3abdff788245a54349..cfca7adf586fe19bc2a25587f75d3e9c1b2a7d7c
--- 1/etc/cinder/cinder.conf.sample
--- 2/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@@ -122,9 -122,9 +122,9 @@@
  ###### (StrOpt) ip address of this host
  # my_ip="10.0.0.1"
  ###### (StrOpt) availability zone of this node
 -# node_availability_zone="cinder"
 +# storage_availability_zone="cinder"
  ###### (StrOpt) Default driver for sending notifications
- # notification_driver="cinder.notifier.no_op_notifier"
+ # notification_driver="cinder.openstack.common.notifier.no_op_notifier"
  ###### (StrOpt) kernel image that indicates not to use a kernel, but to use a raw disk image instead
  # null_kernel="nokernel"
  ###### (ListOpt) Specify list of extensions to load when using osapi_compute_extension option with cinder.api.openstack.compute.contrib.select_extensions