Merge "Adds the random option to cinder retry function"

diff --cc cinder/utils.py
index a113ae1f11b6bf3df342e09baf2a69d3d667f86a,4bfdcfec02343374a6da9d377951f0111614146a..a2c853b066b6f359214cb28f3e937a46974ef8fe
--- 1/cinder/utils.py
--- 2/cinder/utils.py
+++ b/cinder/utils.py
@@@ -27,9 -27,9 +27,10 @@@ import inspec
  import logging as py_logging
  import os
  import pyclbr
+ import random
  import re
  import shutil
 +import socket
  import stat
  import sys
  import tempfile

diff --cc cinder/volume/drivers/hitachi/hnas_backend.py
Simple merge