summaryrefslogtreecommitdiff
path: root/usr/src/lib/pyzfs/common/allow.py
diff options
context:
space:
mode:
authorMatthew Ahrens <mahrens@delphix.com>2013-12-11 14:33:41 -0800
committerChristopher Siden <chris.siden@delphix.com>2013-12-11 14:33:41 -0800
commit78f171005391b928aaf1642b3206c534ed644332 (patch)
tree3877cd3f468bf75cc656c80d8f2f66569c73147a /usr/src/lib/pyzfs/common/allow.py
parent973c78e94bf9634782164382c9e291bf81161fa5 (diff)
downloadillumos-gate-78f171005391b928aaf1642b3206c534ed644332.tar.gz
4369 implement zfs bookmarks
4368 zfs send filesystems from readonly pools Reviewed by: Christopher Siden <christopher.siden@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Approved by: Garrett D'Amore <garrett@damore.org>
Diffstat (limited to 'usr/src/lib/pyzfs/common/allow.py')
-rw-r--r--usr/src/lib/pyzfs/common/allow.py2
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(