a08f68217d
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:24 -07:00
650eeea33e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-08-18 10:50:23 -07:00
f8502d7e00
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:21 -07:00
7096d1493d
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-08-18 10:50:20 -07:00
48dae5b818
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:17 -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
aa16b56204
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-18 09:40:14 -07:00
196779a6c6
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-08-18 09:40:13 -07:00
6afc10589c
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-08-18 09:40:11 -07:00
05e1ea4428
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-08-18 09:40:08 -07:00
e939486047
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-08-18 09:40:05 -07:00
a6d52924a0
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-08-18 09:40:01 -07:00
d2663f7119
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:58 -07:00
8d58e9ee45
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:55 -07:00
ef5e6b8915
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:51 -07:00
b963b34b66
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:48 -07:00
e10c76c84c
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:45 -07:00
cb0a4d25dd
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:42 -07:00
0fae071614
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:38 -07:00
c4f1e1eb9f
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:35 -07:00
f5be401f9c
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:32 -07:00
39ed68a009
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:26 -07:00
616df0cf61
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:20 -07:00
940cffa845
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:17 -07:00
f6e773e7fc
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:13 -07:00
ccad175693
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:10 -07:00
4c172258f0
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:06 -07:00
3bdc98c844
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
configure.ac
scripts/Makefile.am
2009-08-18 09:38:17 -07:00
1f8a43f7a2
Refresh autogen products
2009-08-17 21:58:33 -07:00
49be3a6efa
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-17 21:57:04 -07:00
18f53f542b
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-08-17 21:57:02 -07:00
44020d0ec3
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-17 21:57:01 -07:00
8e954086b9
Add zpios scripts to zfs-test package 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:50:55 -07:00
89d97ddfc9
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-17 21:47:54 -07:00
f35bca5100
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-08-17 21:47:52 -07:00
4affe8b59f
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-08-17 21:47:51 -07:00
8c31c11591
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-08-17 21:47:49 -07:00
36604a118b
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-08-17 21:47:42 -07:00
83003b2fa9
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-17 21:47:40 -07:00
6ee3a5b3a2
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-08-17 21:47:32 -07:00
29bd5696bf
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-17 21:47:30 -07:00
1528509223
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-08-17 21:47:23 -07:00
757483ca58
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-08-17 21:47:21 -07:00
3830822ccf
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-08-17 21:47:13 -07:00
126619b28b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-08-17 21:47:12 -07:00
261ceaea10
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-17 21:47:03 -07:00
48107741cd
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
configure.ac
scripts/Makefile.am
2009-08-17 21:46:51 -07:00
c0e168637d
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-08-17 21:45:56 -07:00
fa3211f17b
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-17 21:45:54 -07:00
Brian Behlendorf