9f1c6b0416
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-12-11 16:21:13 -08:00
912a3fa030
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-12-11 16:21:12 -08:00
69dcaf00f3
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-12-11 16:21:11 -08:00
ac0fb4a24e
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-12-11 16:21:10 -08:00
058ac9ba78
Pull in latest man pages as part of update-zfs.sh
...
The script has been updated to download the latest documentations
packages for Solaris and extract the needed ZFS man pages. These
will still need a little markup to handle changes between the
Solaris and Linux versions of ZFS. Howver, they should be pretty
minor I've tried hard to keep the interface the same.
In additional to the script update the zdb, zfs, and zpool man
pages have been added to the repo.
2009-12-11 16:15:33 -08:00
86debac4c4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-11 12:08:43 -08:00
acd798cfd4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-11 12:07:23 -08:00
f8d093f69b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-12-11 12:07:23 -08:00
0cc4cdb30d
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-12-11 12:07:22 -08:00
b76d12a644
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-12-11 12:07:22 -08:00
ba7ccf8ccd
Cast to unsigned long long for 32-bit arches
2009-12-11 11:41:04 -08:00
ffa4167a7b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-24 15:52:23 -08:00
0ec3a0ef62
Add udev rules to zfs-test package
2009-11-24 15:48:16 -08:00
3ccac0b5c5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-24 15:00:12 -08:00
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
7db119660f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-24 14:18:55 -08:00
c8bd25ac98
Add 'srpm' --with-config option for creation of spec files.
2009-11-24 14:13:25 -08:00
d47d449e62
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-24 13:28:52 -08:00
9441b7efc4
Add chaos5 and rhel6 macro's to the zfs-modules.spec.in
2009-11-24 13:24:25 -08:00
460eee5c4f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-24 12:48:42 -08:00
eb6f06154b
Prep for 0.4.7 tag, updated META and ChangeLog.
2009-11-24 12:43:40 -08:00
e6f9a54ceb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-20 16:22:08 -08:00
c14a8b2272
Ensure *.order and *.markers build products are removed by distclean rule.
2009-11-20 16:17:16 -08:00
0fa82994c4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-20 10:31:30 -08:00
cac1bc41dc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-11-20 10:29:49 -08:00
77c347db31
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-11-20 10:29:48 -08:00
9c8765a219
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-11-20 10:29:48 -08:00
0f315a58bb
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-11-20 10:29:47 -08:00
23304dc828
Add 16 drive promise JBOD zpool configs for small test setup.
2009-11-20 10:12:41 -08:00
6fabeffd3b
Additional ZVOL compatibility autoconf checks and zconfig ZVOL sanity test.
2009-11-20 10:04:56 -08:00
3191b962f6
Prevent gcc uninit compiler warning in zfs_range_unlock_reader().
2009-11-20 09:59:58 -08:00
e4ea868a55
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-16 10:37:59 -08:00
915205a6e8
Add autoconf checks for zvol integration.
2009-11-16 10:31:10 -08:00
911692fabb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-15 16:28:51 -08:00
844280cb2c
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-11-15 16:27:02 -08:00
d00a0ea8a0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-11-15 16:27:02 -08:00
71ccaccb2b
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-11-15 16:27:00 -08:00
368cfaefdb
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-11-15 16:27:00 -08:00
475e214ce1
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-11-15 16:27:00 -08:00
f056747e61
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-11-15 16:27:00 -08:00
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
8c5797df77
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-11-15 16:26:58 -08:00
c53763d2e7
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-11-15 16:26:55 -08:00
7188068143
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-11-15 16:26:54 -08:00
ca3aba32bb
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2009-11-15 16:26:54 -08:00
2985a9c531
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2009-11-15 16:26:53 -08:00
d9ff087661
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-11-15 16:26:53 -08:00
f8e0e1c54d
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2009-11-15 16:26:52 -08:00
8489fdd251
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2009-11-15 16:26:51 -08:00
1e60ba892b
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-11-15 16:26:51 -08:00
Brian Behlendorf