saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2014.7' into '2015.5'

Browse source 
Conflicts:
  - salt/modules/linux_lvm.py
This commit is contained in:
rallytime 2016-09-29 09:02:34 -06:00
commit 51240ecb13
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/linux_lvm.py
View file

@ -306,7 +306,7 @@ def lvcreate(lvname, vgname, size=None, extents=None, snapshot=None, pv=None, **
'monitor', 'ignoremonitoring', 'permission', 'poolmetadatasize',
'readahead', 'regionsize', 'thin', 'thinpool', 'type',
'virtualsize', 'zero')
no_parameter = ('noudevsync', 'ignoremonitoring', )
no_parameter = ('noudevsync', 'ignoremonitoring', 'thin', )
extra_arguments = []
if kwargs: