summaryrefslogtreecommitdiffstats
path: root/cmd
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branchBrian Behlendorf2009-10-271-6/+6
|\
| * Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-10-271-6/+6
| |\
| | * Always open using O_EXCL to ensure the device is not in use.Brian Behlendorf2009-10-271-6/+6
* | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branchBrian Behlendorf2009-10-231-2/+5
|\| |
| * | Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-10-231-2/+5
| |\|
| | * Properly handle block devices other the IDE and SCSI disks.Brian Behlendorf2009-10-231-2/+5
* | | Refresh autogen productsBrian Behlendorf2009-10-237-6/+13
* | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branchBrian Behlendorf2009-10-233-31/+26
|\| |
| * | Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-10-231-29/+24
| |\|
| | * Merge commit 'refs/top-bases/linux-user-disk' into linux-user-diskBrian Behlendorf2009-10-232-2/+2
| | |\
| | * | Misc fixed based on testing with the dragon config.Brian Behlendorf2009-10-231-29/+24
| * | | Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-10-232-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-10-232-2/+2
| | |\ \
| | | * \ Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-10-232-2/+2
| | | |\ \
| | | | * \ Merge branch 'gcc-uninit' into refs/top-bases/gcc-branchBrian Behlendorf2009-10-232-2/+2
| | | | |\ \
| | | | | * | Add two more possible uninit vars flagged by gcc.Brian Behlendorf2009-10-232-2/+2
| | | | | * | Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninitBrian Behlendorf2009-08-186-44/+211
| | | | | |\ \
| | | | | * \ \ Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninitBrian Behlendorf2009-07-028-746/+1331
| | | | | |\ \ \
* | | | | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branchBrian Behlendorf2009-10-211-39/+18
|\| | | | | | | |
| * | | | | | | | Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-10-211-39/+18
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Command 'zpool create' needs to wait on correct partition names.Brian Behlendorf2009-10-211-39/+18
* | | | | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branchBrian Behlendorf2009-10-191-9/+39
|\| | | | | | | |
| * | | | | | | | Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-10-191-9/+39
| |\| | | | | | |
| | * | | | | | | Always preserve the passed path at creation time so udev may be usedBrian Behlendorf2009-10-191-9/+39
* | | | | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branchBrian Behlendorf2009-10-161-3/+4
|\| | | | | | | |
| * | | | | | | | Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-10-161-3/+4
| |\| | | | | | |
| | * | | | | | | Minor bug wholedisk is only valid for VDEV_DISK types.Brian Behlendorf2009-10-161-3/+4
* | | | | | | | | Refresh autogen productsBrian Behlendorf2009-10-157-12/+5
* | | | | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branchBrian Behlendorf2009-10-157-201/+239
|\| | | | | | | |
| * | | | | | | | Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-10-152-196/+234
| |\| | | | | | |
| | * | | | | | | Merge commit 'refs/top-bases/linux-user-disk' into linux-user-diskBrian Behlendorf2009-10-155-5/+5
| | |\| | | | | |
| | * | | | | | | Cleanly integrate ZFS tools with libblkid.Brian Behlendorf2009-10-152-196/+234
| * | | | | | | | Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-10-155-5/+5
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Update build system for libblkid integrationBrian Behlendorf2009-10-155-5/+5
* | | | | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branchBrian Behlendorf2009-10-151-11/+1
|\| | | | | | | |
| * | | | | | | | Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-10-151-11/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove topic branch linux-have-libdiskmgtBrian Behlendorf2009-10-151-11/+1
| | * | | | | | | | Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-10-145-5/+13
| | |\| | | | | | |
| | * | | | | | | | Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-10-091-0/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-10-091-0/+1
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-08-186-44/+211
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-08-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-08-041-32/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-08-041-13/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-07-141-6/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-07-091-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-07-081-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-07-081-61/+62
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-07-082-12/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-07-061-9/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \