summaryrefslogtreecommitdiffstats
path: root/lib/libzfs
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-07-071-1/+1
|\
| * Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-07-071-1/+1
| |\
| | * Merge branch 'fix-acl' into refs/top-bases/fix-branchBrian Behlendorf2009-07-071-1/+1
| | |\
| | | * New topic branch for minor acl related fixesBrian Behlendorf2009-07-071-1/+1
| | * | Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branchBrian Behlendorf2009-07-068-982/+887
| | |\|
* | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-07-071-6/+7
|\| | |
| * | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-07-071-6/+7
| |\ \ \
| | * \ \ Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-071-5/+5
| | |\ \ \
| | | * | | Fix newly introduced missing braces warnings for gcc.Brian Behlendorf2009-07-071-5/+5
| | | * | | Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-bracesBrian Behlendorf2009-07-028-982/+887
| | | |\ \ \ | | | | | |/ | | | | |/|
| | * | | | Merge branch 'gcc-cast' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-071-1/+2
| | |\ \ \ \
| | | * | | | Resolve missing cast warningBrian Behlendorf2009-07-071-1/+2
| | | * | | | Merge commit 'refs/top-bases/gcc-cast' into gcc-castBrian Behlendorf2009-07-028-982/+887
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
* | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-07-068-988/+887
|\| | | | | |
| * | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-07-068-988/+887
| |\| | | | |
| | * | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-028-988/+887
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Rebase master to b117Brian Behlendorf2009-07-028-982/+887
* | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-03-161-1/+1
|\| | | | | |
| * | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-03-161-1/+1
| |\| | | | |
| | * | | | | Merge branch 'gcc-uninit' into refs/top-bases/gcc-branchBrian Behlendorf2009-03-161-1/+1
| | |\ \ \ \ \
| | | * | | | | Add 3 more uninit errors detected by gcc 3.4.0 compiler.Brian Behlendorf2009-03-161-1/+1
* | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-03-161-43/+0
|\| | | | | | |
| * | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-03-161-43/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge branch 'fix-deadcode' into refs/top-bases/fix-branchBrian Behlendorf2009-03-161-43/+0
| | |\ \ \ \ \ \
| | | * | | | | | Remove two self referential functions.Brian Behlendorf2009-03-161-43/+0
| | | | |_|/ / / | | | |/| | | |
* | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-03-121-1/+1
|\| | | | | | |
| * | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-03-121-1/+1
| |\| | | | | |
| | * | | | | | Merge branch 'fix-strncat' into refs/top-bases/fix-branchBrian Behlendorf2009-03-121-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Add fix-strncat branch which corrects a buffer overrun.Brian Behlendorf2009-03-121-1/+1
| | | |/ / / / /
| | * | | | | | Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branchBrian Behlendorf2009-02-185-18/+52
| | |\| | | | |
| | * | | | | | Resolve conflict with removed cleaner typeBrian Behlendorf2009-01-156-122/+337
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branchBrian Behlendorf2008-12-1112-0/+16340
| | |\ \ \ \ \ \ \
* | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-03-123-3/+3
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-03-123-3/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'gcc-uninit' into refs/top-bases/gcc-branchBrian Behlendorf2009-03-123-3/+3
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Resolve remaining uninitialized variablesBrian Behlendorf2009-03-123-3/+3
| | | * | | | | | | Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninitBrian Behlendorf2009-02-185-18/+52
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | * | | | | | | Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninitBrian Behlendorf2009-01-156-122/+337
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | * | | | | | | Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninitBrian Behlendorf2008-12-1112-0/+16341
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | / / / | | | | | |_|/ / / | | | | |/| | | |
* | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-03-121-1/+8
|\| | | | | | | |
| * | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-03-121-1/+8
| |\| | | | | | |
| | * | | | | | | Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branchBrian Behlendorf2009-03-121-1/+8
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add remaining missing cases (or a default) to all switch statements.Brian Behlendorf2009-03-121-1/+8
| | | * | | | | | | Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-caseBrian Behlendorf2009-02-185-18/+52
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | * | | | | | | Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-caseBrian Behlendorf2009-01-156-122/+337
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | * | | | | | | Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-caseBrian Behlendorf2008-12-1112-0/+16362
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | / / / | | | | | |_|/ / / | | | | |/| | | |
* | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-03-116-58/+58
|\| | | | | | | |
| * | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-03-116-58/+58
| |\| | | | | | |
| | * | | | | | | Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branchBrian Behlendorf2009-03-116-58/+58
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Resolve all instances of missing braces.Brian Behlendorf2009-03-116-58/+58
| | | | |_|_|/ / | | | |/| | | |