diff options
| author | delphij <delphij@FreeBSD.org> | 2014-03-20 00:28:53 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-03-20 00:28:53 +0000 |
| commit | ec5d67aa46e2c8259141fe7898d67f24a6f1bda6 (patch) | |
| tree | dddfb59ee71d89633288f659589644655a5f227d /cddl/contrib/opensolaris/lib/pyzfs/common/allow.py | |
| parent | 11b0e21c7539d9eb21846d2b962f24a3c1716d01 (diff) | |
| download | FreeBSD-src-ec5d67aa46e2c8259141fe7898d67f24a6f1bda6.zip FreeBSD-src-ec5d67aa46e2c8259141fe7898d67f24a6f1bda6.tar.gz | |
MFC r260183: MFV r260154 + 260182:
4369 implement zfs bookmarks
4368 zfs send filesystems from readonly pools
Illumos/illumos-gate@78f171005391b928aaf1642b3206c534ed644332
Diffstat (limited to 'cddl/contrib/opensolaris/lib/pyzfs/common/allow.py')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/pyzfs/common/allow.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/lib/pyzfs/common/allow.py b/cddl/contrib/opensolaris/lib/pyzfs/common/allow.py index fa8209f..7ad4b49 100644 --- a/cddl/contrib/opensolaris/lib/pyzfs/common/allow.py +++ b/cddl/contrib/opensolaris/lib/pyzfs/common/allow.py @@ -20,6 +20,7 @@ # CDDL HEADER END # # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013 by Delphix. All rights reserved. # """This module implements the "zfs allow" and "zfs unallow" subcommands. @@ -219,6 +220,7 @@ perms_subcmd = dict( hold=_("Allows adding a user hold to a snapshot"), release=_("Allows releasing a user hold which\n\t\t\t\tmight destroy the snapshot"), diff=_("Allows lookup of paths within a dataset,\n\t\t\t\tgiven an object number. Ordinary users need this\n\t\t\t\tin order to use zfs diff"), + bookmark="", ) perms_other = dict( |
