56c5217b86
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-12-11 16:21:38 -08:00
dd8f466c30
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-12-11 16:21:37 -08:00
373284ec9a
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-12-11 16:21:36 -08:00
d3848c237b
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-12-11 16:21:34 -08:00
9ccb6595b6
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-12-11 16:21:33 -08:00
9ca8de8fce
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-12-11 16:21:31 -08:00
98dedd03e4
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-12-11 16:21:30 -08:00
b1ebd5aefa
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-12-11 16:21:28 -08:00
31b47d8d8d
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-12-11 16:21:27 -08:00
0fbd8729d4
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-12-11 16:21:25 -08:00
e0f0c48f31
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-12-11 16:21:24 -08:00
ec39f81246
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2009-12-11 16:21:22 -08:00
a83be96d1e
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-12-11 16:21:21 -08:00
e4c253b3e3
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2009-12-11 16:21:19 -08:00
2a5101737e
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2009-12-11 16:21:18 -08:00
404d3c8509
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2009-12-11 16:21:16 -08:00
6be4f70345
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2009-12-11 16:21:15 -08:00
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
2b8880572a
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-12-11 12:07:31 -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
037ccf2011
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-11-24 15:51:16 -08:00
0ec3a0ef62
Add udev rules to zfs-test package
2009-11-24 15:48:16 -08:00
a3cde279e0
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-11-24 14:58:56 -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
aa9ced7534
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-11-24 14:17:35 -08:00
c8bd25ac98
Add 'srpm' --with-config option for creation of spec files.
2009-11-24 14:13:25 -08:00
7467a54ca1
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-11-24 13:27:43 -08:00
9441b7efc4
Add chaos5 and rhel6 macro's to the zfs-modules.spec.in
2009-11-24 13:24:25 -08:00
13fd6a1cf2
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-11-24 12:47:27 -08:00
eb6f06154b
Prep for 0.4.7 tag, updated META and ChangeLog.
2009-11-24 12:43:40 -08:00
ba05b614cb
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-11-20 16:20:50 -08:00
c14a8b2272
Ensure *.order and *.markers build products are removed by distclean rule.
2009-11-20 16:17:16 -08:00
2fb4c69f17
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-11-20 10:29:58 -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
a671adeb47
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-11-16 10:36:19 -08:00
915205a6e8
Add autoconf checks for zvol integration.
2009-11-16 10:31:10 -08:00
Brian Behlendorf