diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2011-11-28 21:40:00 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2011-11-28 21:40:00 +0000 |
| commit | 2f7f0f4112b8ba4b044e67a47f842134b7ebb0f6 (patch) | |
| tree | 77fe89756134ff0449a9b13c294d9097b13f8db5 /cddl/lib/libzfs | |
| parent | a56569ba55625ff9912341ebfd8210e1e6a29f6b (diff) | |
| download | src-2f7f0f4112b8ba4b044e67a47f842134b7ebb0f6.tar.gz src-2f7f0f4112b8ba4b044e67a47f842134b7ebb0f6.zip | |
Merge new ZFS features from illumos:
1644 add ZFS "clones" property
https://www.illumos.org/issues/1644
1645 add ZFS "written" and "written@..." properties
https://www.illumos.org/issues/1645
1646 "zfs send" should estimate size of stream
https://www.illumos.org/issues/1646
1647 "zfs destroy" should determine space reclaimed by destroying multiple
snapshots
https://www.illumos.org/issues/1647
1693 persistent 'comment' field for a zpool
https://www.illumos.org/issues/1693
1708 adjust size of zpool history data
https://www.illumos.org/issues/1708
1748 desire support for reguid in zfs
https://www.illumos.org/issues/1748
Obtained from: illumos (changesets 13514, 13524, 13525)
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=228103
Diffstat (limited to 'cddl/lib/libzfs')
| -rw-r--r-- | cddl/lib/libzfs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 6f6414a62d2b..c1dac5004b8c 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -20,8 +20,8 @@ SRCS+= libzfs_changelist.c \ libzfs_config.c \ libzfs_dataset.c \ libzfs_diff.c \ - libzfs_graph.c \ libzfs_import.c \ + libzfs_iter.c \ libzfs_mount.c \ libzfs_pool.c \ libzfs_sendrecv.c \ |