Brian Behlendorf
|
8a41feeedf
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2010-05-18 10:39:10 -07:00 |
|
Brian Behlendorf
|
e95225e562
|
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
|
2010-05-18 10:39:09 -07:00 |
|
Brian Behlendorf
|
28aa57a96e
|
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
|
2010-05-18 10:39:08 -07:00 |
|
Brian Behlendorf
|
954ad37d9a
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2010-05-18 10:39:08 -07:00 |
|
Brian Behlendorf
|
0de170f8e3
|
Merge commit 'refs/top-bases/fix-list' into fix-list
|
2010-05-18 10:39:07 -07:00 |
|
Brian Behlendorf
|
3a0692e739
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2010-05-18 10:39:06 -07:00 |
|
Brian Behlendorf
|
a9f7056f1e
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2010-05-18 10:39:06 -07:00 |
|
Brian Behlendorf
|
2c4c8997de
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2010-05-18 10:39:05 -07:00 |
|
Brian Behlendorf
|
23cbe40ad3
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2010-05-18 10:39:04 -07:00 |
|
Brian Behlendorf
|
ee035079d5
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2010-05-18 10:39:03 -07:00 |
|
Brian Behlendorf
|
e1cd696225
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2010-05-18 10:39:03 -07:00 |
|
Brian Behlendorf
|
dbbd7ab4a0
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2010-05-18 10:39:01 -07:00 |
|
Brian Behlendorf
|
7fbac470a9
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2010-05-18 10:39:01 -07:00 |
|
Brian Behlendorf
|
6a2e2f428f
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2010-05-18 10:39:00 -07:00 |
|
Brian Behlendorf
|
ce4cb18602
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2010-05-18 10:38:59 -07:00 |
|
Brian Behlendorf
|
ff7b97849b
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2010-05-18 10:38:58 -07:00 |
|
Brian Behlendorf
|
8750eceacb
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2010-05-18 10:38:58 -07:00 |
|
Brian Behlendorf
|
c514f119be
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2010-05-18 10:38:57 -07:00 |
|
Brian Behlendorf
|
67ee7919ea
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2010-05-18 10:38:57 -07:00 |
|
Brian Behlendorf
|
0ca07d95e2
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2010-05-18 10:38:56 -07:00 |
|
Brian Behlendorf
|
b45aa2081e
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2010-05-18 10:38:55 -07:00 |
|
Brian Behlendorf
|
9c4d1367a2
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2010-05-18 10:38:55 -07:00 |
|
Brian Behlendorf
|
e4de1eac10
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2010-05-18 10:38:54 -07:00 |
|
Brian Behlendorf
|
6bcbd721e8
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2010-05-18 10:38:53 -07:00 |
|
Brian Behlendorf
|
2a31babc32
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2010-05-18 10:38:53 -07:00 |
|
Brian Behlendorf
|
05b681529f
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2010-05-18 10:38:52 -07:00 |
|
Brian Behlendorf
|
0ee39c6bcf
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2010-05-18 10:38:51 -07:00 |
|
Brian Behlendorf
|
91ac110c9c
|
Update COPYRIGHT and DISCLAIMER.
Update the COPYRIGHT and DISCLAIMER in an attempt to be clear about
the copyright and licensing issues.
|
2010-05-18 10:32:23 -07:00 |
|
Brian Behlendorf
|
3b31b7c0e8
|
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
|
2010-04-29 12:04:26 -07:00 |
|
Brian Behlendorf
|
ec11b6cecb
|
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
|
2010-04-29 12:04:26 -07:00 |
|
Brian Behlendorf
|
0d327d93b6
|
Merge branch 'fix-acl' into refs/top-bases/fix-branch
|
2010-04-29 12:04:25 -07:00 |
|
Brian Behlendorf
|
1264752aa8
|
Merge commit 'refs/top-bases/fix-acl' into fix-acl
|
2010-04-29 12:04:24 -07:00 |
|
Brian Behlendorf
|
2fbc59f539
|
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
|
2010-04-29 12:04:23 -07:00 |
|
Brian Behlendorf
|
c0b678ce5e
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2010-04-29 12:04:23 -07:00 |
|
Brian Behlendorf
|
937c0f121a
|
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
|
2010-04-29 12:04:22 -07:00 |
|
Brian Behlendorf
|
c880752748
|
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
|
2010-04-29 12:04:21 -07:00 |
|
Brian Behlendorf
|
4d4cda51e2
|
Merge commit 'refs/top-bases/fix-list' into fix-list
|
2010-04-29 12:04:20 -07:00 |
|
Brian Behlendorf
|
0ff8a25a8a
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2010-04-29 12:04:20 -07:00 |
|
Brian Behlendorf
|
cf4e5324e9
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2010-04-29 12:04:18 -07:00 |
|
Brian Behlendorf
|
eb6835bf73
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2010-04-29 12:04:18 -07:00 |
|
Brian Behlendorf
|
695903c308
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2010-04-29 12:04:17 -07:00 |
|
Brian Behlendorf
|
036db491b4
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2010-04-29 12:04:17 -07:00 |
|
Brian Behlendorf
|
1a18829f86
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2010-04-29 12:04:15 -07:00 |
|
Brian Behlendorf
|
539276c157
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2010-04-29 12:04:15 -07:00 |
|
Brian Behlendorf
|
5b30cb5202
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2010-04-29 12:04:14 -07:00 |
|
Brian Behlendorf
|
8efa2c0cc8
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2010-04-29 12:04:13 -07:00 |
|
Brian Behlendorf
|
f75b8d294a
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2010-04-29 12:04:12 -07:00 |
|
Brian Behlendorf
|
fa08457e03
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2010-04-29 12:04:11 -07:00 |
|
Brian Behlendorf
|
c28e1220a2
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2010-04-29 12:04:10 -07:00 |
|
Brian Behlendorf
|
b1e72bd6a5
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2010-04-29 12:04:10 -07:00 |