diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-12-12 21:44:02 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-12-12 21:44:02 +0000 |
| commit | e2f9756b8e9461119d4c8b16701e32425283b31a (patch) | |
| tree | 589339198ca8b38dd8280d8664e06d72bca3d83a /usr/src/lib/pyzfs/common/allow.py | |
| parent | d2ea917c8c4786e6dce9d0fd7f18c55c9f72f16e (diff) | |
| parent | 8b36997aa24d9817807faa4efa301ac9c07a2b78 (diff) | |
| download | illumos-joyent-release-20131212.tar.gz | |
[illumos-gate merge]20131212release-20131212
commit 8b36997aa24d9817807faa4efa301ac9c07a2b78
4391 panic system rather than corrupting pool if we hit bug 4390
commit 78f171005391b928aaf1642b3206c534ed644332
4369 implement zfs bookmarks
4368 zfs send filesystems from readonly pools
commit 973c78e94bf9634782164382c9e291bf81161fa5
4121 vdev_label_init should treat request as succeeded when pool is read only
Conflicts:
usr/src/man/man1m/zfs.1m
usr/src/lib/libzfs/common/mapfile-vers
usr/src/lib/libzfs/common/libzfs_impl.h
usr/src/cmd/zfs/zfs_main.c
Diffstat (limited to 'usr/src/lib/pyzfs/common/allow.py')
| -rw-r--r-- | usr/src/lib/pyzfs/common/allow.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/lib/pyzfs/common/allow.py b/usr/src/lib/pyzfs/common/allow.py index fa8209f697..7ad4b49cc3 100644 --- a/usr/src/lib/pyzfs/common/allow.py +++ b/usr/src/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( |