Brian Behlendorf
|
fa94cf43b9
|
Update COPYRIGHT to reference zpios CDDL exceptions.
|
2010-05-18 14:25:28 -07:00 |
|
Brian Behlendorf
|
13ad721a84
|
Move user-arch.m4 change from linux-libspl to zfs-branch.
|
2010-05-18 12:26:48 -07:00 |
|
Brian Behlendorf
|
d115e15d29
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-05-18 11:14:06 -07:00 |
|
Brian Behlendorf
|
c88a793e82
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-05-18 11:14:05 -07:00 |
|
Brian Behlendorf
|
a52727cf3e
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2010-05-18 11:14:04 -07:00 |
|
Brian Behlendorf
|
78d56178f7
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2010-05-18 11:14:04 -07:00 |
|
Brian Behlendorf
|
de49a76d60
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2010-05-18 11:14:03 -07:00 |
|
Brian Behlendorf
|
2b170bc4aa
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2010-05-18 11:14:03 -07:00 |
|
Brian Behlendorf
|
eb262352b9
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2010-05-18 11:14:02 -07:00 |
|
Brian Behlendorf
|
972604b9de
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2010-05-18 11:14:01 -07:00 |
|
Brian Behlendorf
|
b900615c23
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2010-05-18 11:13:59 -07:00 |
|
Brian Behlendorf
|
df96a3b0af
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2010-05-18 11:13:58 -07:00 |
|
Brian Behlendorf
|
071c859042
|
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
|
2010-05-18 11:13:57 -07:00 |
|
Brian Behlendorf
|
99e37fab4d
|
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
|
2010-05-18 11:13:57 -07:00 |
|
Brian Behlendorf
|
bb49d90ec7
|
Merge commit 'refs/top-bases/fix-acl' into fix-acl
|
2010-05-18 11:13:56 -07:00 |
|
Brian Behlendorf
|
2bc6d6fc45
|
Merge branch 'fix-acl' into refs/top-bases/fix-branch
|
2010-05-18 11:13:56 -07:00 |
|
Brian Behlendorf
|
34aabc8309
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2010-05-18 11:13:55 -07:00 |
|
Brian Behlendorf
|
7096dd4914
|
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
|
2010-05-18 11:13:54 -07:00 |
|
Brian Behlendorf
|
4aec1b2c69
|
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
|
2010-05-18 11:13:54 -07:00 |
|
Brian Behlendorf
|
e8b390e859
|
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
|
2010-05-18 11:13:53 -07:00 |
|
Brian Behlendorf
|
f09781f3f8
|
Merge commit 'refs/top-bases/fix-list' into fix-list
|
2010-05-18 11:13:52 -07:00 |
|
Brian Behlendorf
|
0a4dc624e1
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2010-05-18 11:13:52 -07:00 |
|
Brian Behlendorf
|
ad02550d1a
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2010-05-18 11:13:51 -07:00 |
|
Brian Behlendorf
|
fa769a9f38
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2010-05-18 11:13:50 -07:00 |
|
Brian Behlendorf
|
4da95d62db
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2010-05-18 11:13:49 -07:00 |
|
Brian Behlendorf
|
1f12fcbd5f
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2010-05-18 11:13:49 -07:00 |
|
Brian Behlendorf
|
9e5c771d80
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2010-05-18 11:13:48 -07:00 |
|
Brian Behlendorf
|
c9d613e12e
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2010-05-18 11:13:47 -07:00 |
|
Brian Behlendorf
|
4faedb35e3
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2010-05-18 11:13:46 -07:00 |
|
Brian Behlendorf
|
32ef72e3a7
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2010-05-18 11:13:45 -07:00 |
|
Brian Behlendorf
|
8201e8130a
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2010-05-18 11:13:44 -07:00 |
|
Brian Behlendorf
|
b513d368ae
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2010-05-18 11:13:44 -07:00 |
|
Brian Behlendorf
|
e056080465
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2010-05-18 11:13:43 -07:00 |
|
Brian Behlendorf
|
71f175ea41
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2010-05-18 11:13:43 -07:00 |
|
Brian Behlendorf
|
6c60454d62
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2010-05-18 11:13:42 -07:00 |
|
Brian Behlendorf
|
5a00f225dc
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2010-05-18 11:13:42 -07:00 |
|
Brian Behlendorf
|
60321fed18
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2010-05-18 11:13:41 -07:00 |
|
Brian Behlendorf
|
d4e9908cc6
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2010-05-18 11:13:40 -07:00 |
|
Brian Behlendorf
|
62e78712cd
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2010-05-18 11:13:40 -07:00 |
|
Brian Behlendorf
|
3c36b59995
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2010-05-18 11:13:39 -07:00 |
|
Brian Behlendorf
|
a8c26f8852
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2010-05-18 11:13:38 -07:00 |
|
Brian Behlendorf
|
e167a71897
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2010-05-18 11:13:38 -07:00 |
|
Brian Behlendorf
|
78c53586f5
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2010-05-18 11:13:37 -07:00 |
|
Brian Behlendorf
|
466a4d1d36
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2010-05-18 11:13:37 -07:00 |
|
Brian Behlendorf
|
4f652e0902
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2010-05-18 11:13:32 -07:00 |
|
Brian Behlendorf
|
c647d62535
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2010-05-18 11:13:31 -07:00 |
|
Brian Behlendorf
|
3efcbfaaaf
|
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
|
2010-05-18 11:13:31 -07:00 |
|
Brian Behlendorf
|
9ebc59966e
|
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
|
2010-05-18 11:13:30 -07:00 |
|
Brian Behlendorf
|
61e0639e9b
|
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
|
2010-05-18 11:13:28 -07:00 |
|
Brian Behlendorf
|
3782406250
|
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
|
2010-05-18 11:13:27 -07:00 |