Merge "Fix 'search_opts' unexpected keyword argument error"
This commit is contained in:
		| @@ -36,7 +36,7 @@ class VolumeEncryptionTypeManager(base.ManagerWithFind): | ||||
|     """ | ||||
|     resource_class = VolumeEncryptionType | ||||
|  | ||||
|     def list(self): | ||||
|     def list(self, search_opts=None): | ||||
|         """ | ||||
|         List all volume encryption types. | ||||
|  | ||||
|   | ||||
| @@ -64,7 +64,7 @@ class VolumeTransferManager(base.ManagerWithFind): | ||||
|         """ | ||||
|         return self._get("/os-volume-transfer/%s" % transfer_id, "transfer") | ||||
|  | ||||
|     def list(self, detailed=True): | ||||
|     def list(self, detailed=True, search_opts=None): | ||||
|         """Get a list of all volume transfer. | ||||
|  | ||||
|         :rtype: list of :class:`VolumeTransfer` | ||||
|   | ||||
| @@ -36,7 +36,7 @@ class VolumeEncryptionTypeManager(base.ManagerWithFind): | ||||
|     """ | ||||
|     resource_class = VolumeEncryptionType | ||||
|  | ||||
|     def list(self): | ||||
|     def list(self, search_opts=None): | ||||
|         """ | ||||
|         List all volume encryption types. | ||||
|  | ||||
|   | ||||
| @@ -64,7 +64,7 @@ class VolumeTransferManager(base.ManagerWithFind): | ||||
|         """ | ||||
|         return self._get("/os-volume-transfer/%s" % transfer_id, "transfer") | ||||
|  | ||||
|     def list(self, detailed=True): | ||||
|     def list(self, detailed=True, search_opts=None): | ||||
|         """Get a list of all volume transfer. | ||||
|  | ||||
|         :rtype: list of :class:`VolumeTransfer` | ||||
|   | ||||
| @@ -43,6 +43,7 @@ MASTER | ||||
| .. _1251385: http://bugs.launchpad.net/python-cinderclient/+bug/1251385 | ||||
| .. _1264415: http://bugs.launchpad.net/python-cinderclient/+bug/1264415 | ||||
| .. _1258489: http://bugs.launchpad.net/python-cinderclient/+bug/1258489 | ||||
| .. _1248519: http://bugs.launchpad.net/python-cinderclient/+bug/1248519 | ||||
|  | ||||
| 1.0.7 | ||||
| ----- | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Jenkins
					Jenkins