Commit Graph

2770 Commits

Author SHA1 Message Date
Brian Behlendorf 303178da41 Revert linux-doc changes 2009-12-11 14:07:53 -08:00
Brian Behlendorf d2c7ce43b6 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-12-11 12:07:24 -08:00
Brian Behlendorf acd798cfd4 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-12-11 12:07:23 -08:00
Brian Behlendorf f8d093f69b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-12-11 12:07:23 -08:00
Brian Behlendorf 0cc4cdb30d Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-12-11 12:07:22 -08:00
Brian Behlendorf b76d12a644 Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2009-12-11 12:07:22 -08:00
Brian Behlendorf ba7ccf8ccd Cast to unsigned long long for 32-bit arches 2009-12-11 11:41:04 -08:00
Brian Behlendorf 73b4663195 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-24 15:51:09 -08:00
Brian Behlendorf 0ec3a0ef62 Add udev rules to zfs-test package 2009-11-24 15:48:16 -08:00
Brian Behlendorf afebc9a7fa Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-24 14:58:48 -08:00
Brian Behlendorf 07a35df315 The libuuid and libblkid have been split from e2fsprogs in fc12,
el6, and ch5 systems.  Additionally, correct ZFS filesystem detection
has not yet been added to these packages so for now disable blkid.
2009-11-24 14:54:33 -08:00
Brian Behlendorf d7f9e430ac Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-24 14:17:28 -08:00
Brian Behlendorf c8bd25ac98 Add 'srpm' --with-config option for creation of spec files. 2009-11-24 14:13:25 -08:00
Brian Behlendorf 171af374b2 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-24 13:27:36 -08:00
Brian Behlendorf 9441b7efc4 Add chaos5 and rhel6 macro's to the zfs-modules.spec.in 2009-11-24 13:24:25 -08:00
Brian Behlendorf 7ef25bb69d Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-24 12:47:19 -08:00
Brian Behlendorf eb6f06154b Prep for 0.4.7 tag, updated META and ChangeLog. 2009-11-24 12:43:40 -08:00
Brian Behlendorf 1d74603aa5 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-20 16:20:43 -08:00
Brian Behlendorf c14a8b2272 Ensure *.order and *.markers build products are removed by distclean rule. 2009-11-20 16:17:16 -08:00
Brian Behlendorf e007a57d4f Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-20 10:29:50 -08:00
Brian Behlendorf cac1bc41dc Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-11-20 10:29:49 -08:00
Brian Behlendorf 77c347db31 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-11-20 10:29:48 -08:00
Brian Behlendorf 9c8765a219 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-11-20 10:29:48 -08:00
Brian Behlendorf 0f315a58bb Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-11-20 10:29:47 -08:00
Brian Behlendorf 23304dc828 Add 16 drive promise JBOD zpool configs for small test setup. 2009-11-20 10:12:41 -08:00
Brian Behlendorf 6fabeffd3b Additional ZVOL compatibility autoconf checks and zconfig ZVOL sanity test. 2009-11-20 10:04:56 -08:00
Brian Behlendorf 3191b962f6 Prevent gcc uninit compiler warning in zfs_range_unlock_reader(). 2009-11-20 09:59:58 -08:00
Brian Behlendorf 9a8e4af989 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-16 10:36:11 -08:00
Brian Behlendorf 915205a6e8 Add autoconf checks for zvol integration. 2009-11-16 10:31:10 -08:00
Brian Behlendorf 868f5ba008 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-15 16:27:03 -08:00
Brian Behlendorf 844280cb2c Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-11-15 16:27:02 -08:00
Brian Behlendorf d00a0ea8a0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-11-15 16:27:02 -08:00
Brian Behlendorf 368cfaefdb Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-11-15 16:27:00 -08:00
Brian Behlendorf f056747e61 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-11-15 16:27:00 -08:00
Brian Behlendorf 71ccaccb2b Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-11-15 16:27:00 -08:00
Brian Behlendorf 475e214ce1 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2009-11-15 16:27:00 -08:00
Brian Behlendorf 8c5797df77 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-11-15 16:26:58 -08:00
Brian Behlendorf 65f6d4b712 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-11-15 16:26:58 -08:00
Brian Behlendorf c53763d2e7 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-11-15 16:26:55 -08:00
Brian Behlendorf 7188068143 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-11-15 16:26:54 -08:00
Brian Behlendorf ca3aba32bb Merge branch 'fix-acl' into refs/top-bases/fix-branch 2009-11-15 16:26:54 -08:00
Brian Behlendorf d9ff087661 Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2009-11-15 16:26:53 -08:00
Brian Behlendorf 2985a9c531 Merge commit 'refs/top-bases/fix-acl' into fix-acl 2009-11-15 16:26:53 -08:00
Brian Behlendorf f8e0e1c54d Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode 2009-11-15 16:26:52 -08:00
Brian Behlendorf 1e60ba892b Merge branch 'fix-strncat' into refs/top-bases/fix-branch 2009-11-15 16:26:51 -08:00
Brian Behlendorf 8489fdd251 Merge commit 'refs/top-bases/fix-strncat' into fix-strncat 2009-11-15 16:26:51 -08:00
Brian Behlendorf 7d49468141 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-11-15 16:26:50 -08:00
Brian Behlendorf a81f45b3ee Merge commit 'refs/top-bases/fix-list' into fix-list 2009-11-15 16:26:50 -08:00
Brian Behlendorf a41e8c431f Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2009-11-15 16:26:49 -08:00
Brian Behlendorf e530326e8f Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-11-15 16:26:48 -08:00