93f8b6d142
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-10-05 13:11:01 -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
d553271300
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-10-01 17:08:46 -07:00
0efea24e73
Add zconfig.sg test script.
...
This is an initial script for validation of zfs/zpool configuration.
For now there is only one test here to ensure that /etc/zfs/zpool.cache
is being updated properly from the kernel module. Additional tests
should be added, I believe Richardo said there was an existing test
suite out there which validated the behavior of many zpool/zfs commands.
It would be nice to add that as appropriate.
2009-10-01 16:55:34 -07:00
0076202c0f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-18 14:21:23 -07:00
e4b55cfbff
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 14:18:36 -07:00
5d83878f46
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 14:18:34 -07:00
21ccfb65d6
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-08-18 14:18:33 -07:00
e134b976b6
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-08-18 14:18:33 -07:00
ef74bed821
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-08-18 14:18:32 -07:00
f3ddd9d082
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-08-18 14:18:32 -07:00
8767bb3fdd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-08-18 14:18:31 -07:00
f9a74de46a
Required build 121 updates for gcc-uninit
2009-08-18 14:09:35 -07:00
08f5b3c23d
Required build 121 updates for gcc-shadow
2009-08-18 14:09:15 -07:00
b29c1f87a0
Required build 121 updates for gcc-missing-braces
2009-08-18 14:08:46 -07:00
d42b88372f
Required build 121 updates for gcc-c90
2009-08-18 14:07:25 -07:00
5b4a08d0f4
Move ZPIOS chunk to linux-zpios topic branch
2009-08-18 14:06:05 -07:00
917a08a678
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-18 12:34:56 -07:00
50c623ccef
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 12:10:55 -07:00
ef0204794a
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-08-18 12:10:51 -07:00
799792cf1c
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-08-18 12:10:49 -07:00
33143ae6ad
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-08-18 12:10:47 -07:00
8aab887b7c
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-08-18 12:10:47 -07:00
5a81224e6f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-08-18 12:10:43 -07:00
bfbac5daec
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-08-18 12:10:38 -07:00
4f6bbcd0e7
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-08-18 12:10:36 -07:00
3fd8eb337b
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-08-18 12:10:30 -07:00
e24611a2a9
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-08-18 12:10:28 -07:00
7945050987
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2009-08-18 12:10:24 -07:00
3206fa76cc
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2009-08-18 12:10:23 -07:00
bd4a1cc4ef
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-08-18 12:10:18 -07:00
fe373ddad8
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2009-08-18 12:10:17 -07:00
5e33dd44ae
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-08-18 12:10:13 -07:00
c77ce6cb93
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2009-08-18 12:10:12 -07:00
0d46ebf0ff
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-08-18 12:10:08 -07:00
ae5bc5970d
Merge commit 'refs/top-bases/fix-list' into fix-list
2009-08-18 12:10:07 -07:00
8a8490b570
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2009-08-18 12:10:03 -07:00
e20ba40c91
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-08-18 12:10:02 -07:00
12c361b1a1
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-08-18 12:09:58 -07:00
f8cca2b295
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-08-18 12:09:57 -07:00
0911c7f7c3
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-08-18 12:09:53 -07:00
169f50db79
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-08-18 12:09:52 -07:00
0ec64690ba
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2009-08-18 12:09:47 -07:00
abe9fefd9b
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2009-08-18 12:09:46 -07:00
3454bd3d24
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2009-08-18 12:09:42 -07:00
e8791794b6
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2009-08-18 12:09:41 -07:00
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
Brian Behlendorf