~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/volume/storwize_svc.py

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman, Adam Gandelman, Chuck Short
  • Date: 2012-08-27 15:37:18 UTC
  • mfrom: (1.1.60)
  • Revision ID: package-import@ubuntu.com-20120827153718-lj8er44eqqz1gsrj
Tags: 2012.2~rc1~20120827.15815-0ubuntu1
[ Adam Gandelman ]
* New upstream release.

[ Chuck Short ]
* debian/patches/0001-Update-tools-hacking-for-pep8-1.2-and-
  beyond.patch: Dropped we dont run pep8 tests anymore.
* debian/control: Drop pep8 build depends
* debian/*.upstart.in: Make sure we transition correctly from runlevel
  1 to 2. (LP: #820694)

Show diffs side-by-side

added added

removed removed

Lines of Context:
49
49
from nova.openstack.common import cfg
50
50
from nova.openstack.common import excutils
51
51
from nova.openstack.common import log as logging
52
 
from nova import utils
53
52
from nova.volume import san
54
53
 
55
54
LOG = logging.getLogger(__name__)
80
79
               help='Storage system compression option for volumes'),
81
80
    cfg.StrOpt('storwize_svc_flashcopy_timeout',
82
81
               default='120',
83
 
               help='Maximum number of seconds to wait for FlashCopy to be'
 
82
               help='Maximum number of seconds to wait for FlashCopy to be '
84
83
                    'prepared. Maximum value is 600 seconds (10 minutes).'),
85
84
]
86
85