3eadb69629
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-08-18 12:09:37 -07:00
b3ea816a68
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-08-18 12:09:36 -07:00
170144c78f
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2009-08-18 12:09:32 -07:00
b8667c4859
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2009-08-18 12:09:31 -07:00
1222979fd0
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2009-08-18 12:09:27 -07:00
e7c05295ca
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-08-18 12:09:26 -07:00
78c9472f02
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-08-18 12:09:22 -07:00
e7334931f1
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-08-18 12:09:21 -07:00
35402a2780
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2009-08-18 12:09:16 -07:00
b330ab77df
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-08-18 12:09:14 -07:00
d205b25a74
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-08-18 12:09:10 -07:00
25ddaec292
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-08-18 12:09:07 -07:00
b99b422796
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 12:08:58 -07:00
88531ad82b
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-08-18 12:08:56 -07:00
9f5c891fb1
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-08-18 12:08:53 -07:00
cadd2ec869
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2009-08-18 12:08:52 -07:00
1d7551423a
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-08-18 12:08:47 -07:00
41b297a27f
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2009-08-18 12:08:46 -07:00
dc2aa83adf
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-08-18 12:08:41 -07:00
abd8fdb94f
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
...
Conflicts:
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
2009-08-18 12:08:36 -07:00
80785b829e
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-08-18 12:07:41 -07:00
9d2ca4a4d4
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-08-18 12:07:40 -07:00
c0cef09b7e
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-08-18 12:07:35 -07:00
db89339134
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-08-18 12:07:23 -07:00
b760445ff5
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-08-18 12:06:54 -07:00
3a37442dc7
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-08-18 12:06:53 -07:00
50d2c65daf
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-08-18 12:06:48 -07:00
c5b5d32d69
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/vdev_raidz.c
2009-08-18 12:06:21 -07:00
268e04166d
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-08-18 12:05:40 -07:00
481225606c
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-08-18 12:05:39 -07:00
387821c409
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-08-18 12:05:34 -07:00
e95fcbffd9
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-08-18 12:05:33 -07:00
ff0406ccc5
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2009-08-18 12:05:28 -07:00
38cc41b5fe
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-08-18 12:05:26 -07:00
4a4de1cc99
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2009-08-18 12:05:22 -07:00
bb286fe763
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2009-08-18 12:05:20 -07:00
012cc31598
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2009-08-18 12:05:17 -07:00
c3a6c4afba
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2009-08-18 12:05:13 -07:00
4b1b3d2498
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-08-18 12:05:09 -07:00
9e903015fd
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-08-18 12:05:07 -07:00
e5e4fadc34
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/dmu.c
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
module/zfs/vdev_raidz.c
2009-08-18 12:04:53 -07:00
0f80e41c89
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/spa_misc.c
module/zfs/vdev_label.c
2009-08-18 11:55:36 -07:00
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
44461776c4
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-08-18 10:50:16 -07:00
adc7bb76f2
Add 3 dragon drawer test configurations (raid0, raidz, raidz2).
...
The current test rig consists of two 60 disk dragon drawers in configured
in 4-x15 mode. Each drawer has 4 SAS connections to my node for a total
of 8 SAS connections spread over 4 dual-port LSI SAS adapters. The
configures are as follows:
- raid0: All 120 drives in a single pool.
- raidz: 15 RAIDZ groups of 7+1.
- raidz2: 15 RAIDZ2 groups of 6+2.
2009-08-18 10:40:30 -07:00
a0c7fb482c
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-08-17 21:40:53 -07:00
4f555da51d
Add zfs-test package which includes test infrastructure.
...
This change extends the existing in-tree test infrastructure such
that it can also be run as part of a the installed package. This
simplifies testing on multiple systems and is generally all around
useful. The scripts may still be run in-tree and will use the
in-tree build products as long as .script-config exists.
2009-08-17 21:35:06 -07:00
6e760bf59e
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-08-14 16:26:46 -07:00
6857a2e5a0
Various spec file tweaks to handle rpm building of several distros.
...
Supported and tested distros now include SLES10, SLES11, Chaos 4.x,
RHEL5, and Fedora 11. This update was mainly to address rebuildable
kernel module rpms, and correct rpm dependencies for each distro.
2009-08-14 16:22:20 -07:00
c7821020e8
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-08-14 10:22:11 -07:00
Brian Behlendorf