predefined deletion revoke
Merge branch 'develop' of https://github.com/sstrato/nova into develop