Brian Behlendorf
ec39f81246
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2009-12-11 16:21:22 -08:00
Brian Behlendorf
a83be96d1e
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-12-11 16:21:21 -08:00
Brian Behlendorf
e4c253b3e3
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2009-12-11 16:21:19 -08:00
Brian Behlendorf
2a5101737e
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2009-12-11 16:21:18 -08:00
Brian Behlendorf
404d3c8509
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2009-12-11 16:21:16 -08:00
Brian Behlendorf
6be4f70345
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2009-12-11 16:21:15 -08:00
Brian Behlendorf
9f1c6b0416
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-12-11 16:21:13 -08:00
Brian Behlendorf
912a3fa030
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-12-11 16:21:12 -08:00
Brian Behlendorf
69dcaf00f3
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-12-11 16:21:11 -08:00
Brian Behlendorf
ac0fb4a24e
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-12-11 16:21:10 -08:00
Brian Behlendorf
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
Brian Behlendorf
202884ef48
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-12-11 12:07:46 -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
80a4449d7e
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-24 15:51:30 -08:00
Brian Behlendorf
0ec3a0ef62
Add udev rules to zfs-test package
2009-11-24 15:48:16 -08:00
Brian Behlendorf
8c87d8b629
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-24 14:59:12 -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
edfc9619bb
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-24 14:17:51 -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
5c9bc285fc
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-24 13:27:57 -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
708313ebd5
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-24 12:47:43 -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
b8ed184744
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-20 16:21:06 -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
6e3ed3f781
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-20 10:30:15 -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
5576ed7f1c
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-16 10:36:37 -08:00
Brian Behlendorf
915205a6e8
Add autoconf checks for zvol integration.
2009-11-16 10:31:10 -08:00
Brian Behlendorf
dfcbd0caea
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-15 16:27:29 -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
71ccaccb2b
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-11-15 16:27:00 -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
475e214ce1
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
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
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
8c5797df77
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
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