summaryrefslogtreecommitdiff
path: root/usr/src/lib/libzfs/common/mapfile-vers
diff options
context:
space:
mode:
authorJohn Sonnenschein <johns@joyent.com>2012-05-17 18:26:57 +0000
committerJohn Sonnenschein <johns@joyent.com>2012-05-17 18:26:57 +0000
commit04b244dd661c24b510ac22936decfc0972d202d3 (patch)
tree3ebfef98afc303fddf3415d6fba64e8682f495e8 /usr/src/lib/libzfs/common/mapfile-vers
parenteac250589e41f1b705e1b7427b02b3379aac9f9e (diff)
parenta69187741b83640a90dd8586195456dd50c016a8 (diff)
downloadillumos-joyent-20120517.tar.gz
Merge git.joyent.com:illumos-joyent20120517
Diffstat (limited to 'usr/src/lib/libzfs/common/mapfile-vers')
-rw-r--r--usr/src/lib/libzfs/common/mapfile-vers5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr/src/lib/libzfs/common/mapfile-vers b/usr/src/lib/libzfs/common/mapfile-vers
index 26c942a1e1..b6145a09d0 100644
--- a/usr/src/lib/libzfs/common/mapfile-vers
+++ b/usr/src/lib/libzfs/common/mapfile-vers
@@ -20,7 +20,7 @@
#
# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2011 Nexenta Systems, Inc. All rights reserved.
-# Copyright (c) 2011 by Delphix. All rights reserved.
+# Copyright (c) 2012 by Delphix. All rights reserved.
# Copyright (c) 2012, Joyent, Inc. All rights reserved.
#
# MAPFILE HEADER START
@@ -196,6 +196,7 @@ SYMBOL_VERSION SUNWprivate_1.1 {
zpool_import_props;
zpool_import_status;
zpool_in_use;
+ zpool_is_bootable;
zpool_iter;
zpool_label_disk;
zpool_mount_datasets;
@@ -211,6 +212,7 @@ SYMBOL_VERSION SUNWprivate_1.1 {
zpool_read_label;
zpool_refresh_stats;
zpool_reguid;
+ zpool_reopen;
zpool_scan;
zpool_search_import;
zpool_set_history_str;
@@ -233,6 +235,7 @@ SYMBOL_VERSION SUNWprivate_1.1 {
zprop_get_list;
zprop_iter;
zprop_print_one_property;
+ zprop_width;
zvol_check_dump_config;
zvol_volsize_to_reservation;
local: