]> git.proxmox.com Git - mirror_zfs-debian.git/commitdiff
projects / mirror_zfs-debian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4fd3ee 3d248ae)
Merge tag 'upstream/0.6.5.11'
authorAron Xu <aron@debian.org>
Fri, 14 Jul 2017 08:30:36 +0000 (16:30 +0800)
committerAron Xu <aron@debian.org>
Fri, 14 Jul 2017 08:30:36 +0000 (16:30 +0800)
Upstream version 0.6.5.11

Conflicts:
META
config/config.guess
config/config.sub
config/install-sh
config/libtool.m4
config/ltmain.sh
configure
lib/libzfs/libzfs.pc
lib/libzfs/libzfs_core.pc
rpm/generic/zfs-kmod.spec.in
rpm/generic/zfs.spec.in
rpm/redhat/zfs.spec.in


Trivial merge
Mirror of ZFSOnLinux for Debian