fb2c44bdfc
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2009-10-09 15:43:10 -07:00
1d88115083
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2009-10-09 15:43:10 -07:00
1af5dcae21
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-10-09 15:43:08 -07:00
8dc9c727ad
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-10-09 15:43:08 -07:00
a8c1c53084
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2009-10-09 15:43:07 -07:00
7cfd9ab530
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2009-10-09 15:43:06 -07:00
1004439a17
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-10-09 15:43:05 -07:00
b66f239d85
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2009-10-09 15:43:05 -07:00
08328c349b
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-10-09 15:43:03 -07:00
f2d727b7d9
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-10-09 15:43:03 -07:00
aed78880bc
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2009-10-09 15:43:02 -07:00
e3ad5a40f6
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-10-09 15:43:01 -07:00
5fc177d934
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-10-09 15:43:00 -07:00
b882332ed3
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-10-09 15:42:59 -07:00
9302f90662
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-10-09 15:42:56 -07:00
410802e85a
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-10-09 15:42:55 -07:00
f01e795a02
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-10-09 15:42:55 -07:00
a0213b0238
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2009-10-09 15:42:53 -07:00
d98723bbe1
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-10-09 15:42:52 -07:00
c7b65bad15
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2009-10-09 15:42:51 -07:00
d60faa52c9
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-10-09 15:42:49 -07:00
926a2e3cc4
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2009-10-09 15:42:48 -07:00
3242ff554b
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-10-09 15:42:46 -07:00
2a70700fcf
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-10-09 15:42:45 -07:00
c124e075ea
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-10-09 15:42:43 -07:00
bbdc4a3fcc
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-10-09 15:42:42 -07:00
284b18be1a
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-10-09 15:42:40 -07:00
db80e45d81
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-10-09 15:42:39 -07:00
112ef3feed
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-10-09 15:42:37 -07:00
069d3a4c55
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-10-09 15:42:36 -07:00
7db8cdbac8
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-10-09 15:42:34 -07:00
8a9880d6fb
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-10-09 15:42:33 -07:00
4de4b25bfe
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-10-09 15:42:31 -07:00
4379264fa3
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-10-09 15:42:30 -07:00
452588a0fa
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2009-10-09 15:42:28 -07:00
eccbb9ac6a
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-10-09 15:42:27 -07:00
4c6a698aec
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2009-10-09 15:42:25 -07:00
b269fd904e
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2009-10-09 15:42:24 -07:00
7e8136818b
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2009-10-09 15:42:23 -07:00
c0df2778ff
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2009-10-09 15:42:21 -07:00
69ce77278a
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-10-09 15:42:19 -07:00
05aabf4bea
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-10-09 15:42:18 -07:00
3728b6d9c1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-10-09 15:42:16 -07:00
1b0e5a1485
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-10-09 15:42:15 -07:00
5c36312909
Script update-zfs.sh updated to include libefi library
2009-10-09 15:37:29 -07:00
9aad2e472d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-06 12:27:06 -07:00
5d4c60fabe
Use alternate /etc/zfs/zpool.cache file for in-tree tests
...
Pass an alternate location via module option for the zpool.cache file
used by the kernel. This allows us to write in-tree tests which do
not modify any out-of-tree files we do not own. This is just standard
good behavior for any test suite.
Additionally, refine the existing test case to explicity use the cache
file when looking for pools to import. And add a second test cache
which is forced to probe the disks for available pools to import.
2009-10-06 12:12:05 -07:00
bc44c49d19
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-05 13:09:31 -07:00
b615df53c8
Remove usage of the __id_u macro for portability.
...
This macro was removed from the default RPM macro file. Interestly,
some of the arch specific macro's add it back it based on your distro
but it should not be counted on. However, __id still exists and its
command line args have historically been fairly stable so we will
directly use %{__id} -un to get the user name.
2009-10-05 13:01:01 -07:00
11b75fb752
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-01 17:07:46 -07:00
Brian Behlendorf