diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-15 16:32:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-15 16:32:25 +0000 |
| commit | da16294cc68d02f6eeea641dbc452f7c668385ba (patch) | |
| tree | cb7e529b4250e0471d279ccc9b98c67e50f37edb | |
| parent | 31d46c9ff356a56b7521b341ad2dea011917f416 (diff) | |
| parent | 6b412e8647beae0e6e9215ab640ec50ff750d665 (diff) | |
| download | designate-da16294cc68d02f6eeea641dbc452f7c668385ba.tar.gz | |
Merge "Fixes wording of exceptions for delete" into stable/liberty
| -rw-r--r-- | designate/central/service.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/designate/central/service.py b/designate/central/service.py index 24874c41..4a45ea6e 100644 --- a/designate/central/service.py +++ b/designate/central/service.py @@ -1422,7 +1422,7 @@ class Service(service.RPCService, service.Service): policy.check('delete_recordset', context, target) if recordset.managed and not context.edit_managed_records: - raise exceptions.BadRequest('Managed records may not be updated') + raise exceptions.BadRequest('Managed records may not be deleted') recordset, domain = self._delete_recordset_in_storage( context, domain, recordset, increment_serial=increment_serial) @@ -1659,7 +1659,7 @@ class Service(service.RPCService, service.Service): policy.check('delete_record', context, target) if recordset.managed and not context.edit_managed_records: - raise exceptions.BadRequest('Managed records may not be updated') + raise exceptions.BadRequest('Managed records may not be deleted') record, domain = self._delete_record_in_storage( context, domain, record, increment_serial=increment_serial) |