diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-01-02 07:34:36 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-01-02 07:34:36 +0000 |
| commit | ab0b9f6b3073e6c4d1dfbf07444d7db67a189a96 (patch) | |
| tree | 372b69ad0417164d9803ac0518c9aa5b3284ef22 /cddl/contrib/opensolaris/lib/pyzfs | |
| parent | 6f2791f53ab435f91846dc897cb7e1ba99b6a1a4 (diff) | |
| parent | cbdc7594240d12003707a39843af39a7a0c8a726 (diff) | |
| download | src-ab0b9f6b3073e6c4d1dfbf07444d7db67a189a96.tar.gz src-ab0b9f6b3073e6c4d1dfbf07444d7db67a189a96.zip | |
MFV r260154 + 260182:
4369 implement zfs bookmarks
4368 zfs send filesystems from readonly pools
Illumos/illumos-gate@78f171005391b928aaf1642b3206c534ed644332
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=260183
Diffstat (limited to 'cddl/contrib/opensolaris/lib/pyzfs')
| -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 fa8209f697fd..7ad4b49cc374 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( |