Commit Graph

809 Commits

Author SHA1 Message Date
Brian Behlendorf 09d8fd136b Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-01-15 14:16:07 -08:00
Brian Behlendorf 7c80f43566 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-01-15 14:16:06 -08:00
Brian Behlendorf 81d8053623 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2009-01-15 14:16:04 -08:00
Brian Behlendorf a42707fcc0 Resolve conflict with removed cleaner type 2009-01-15 14:16:03 -08:00
Brian Behlendorf 3a8135e14c Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2009-01-15 14:15:04 -08:00
Brian Behlendorf 10280d0999 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2009-01-15 14:15:04 -08:00
Brian Behlendorf a7486f9608 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2009-01-15 14:15:01 -08:00
Brian Behlendorf c1f89769dd Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2009-01-15 14:15:01 -08:00
Brian Behlendorf 520bbb108d Merge branch 'fix-locks' into refs/top-bases/fix-branch 2009-01-15 14:14:59 -08:00
Brian Behlendorf 089836c3e4 Resolve conflict with removed cleaner type 2009-01-15 14:14:57 -08:00
Brian Behlendorf 48a55a0a10 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2009-01-15 14:13:54 -08:00
Brian Behlendorf c6292c47a7 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2009-01-15 14:13:54 -08:00
Brian Behlendorf a69d02c405 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2009-01-15 14:13:52 -08:00
Brian Behlendorf 6d0be909c8 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2009-01-15 14:13:51 -08:00
Brian Behlendorf a378243d07 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2009-01-15 14:13:49 -08:00
Brian Behlendorf 6e3c742027 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2009-01-15 14:13:49 -08:00
Brian Behlendorf d558d8818e Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2009-01-15 14:13:47 -08:00
Brian Behlendorf 216ce72418 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2009-01-15 14:13:46 -08:00
Brian Behlendorf 973c927422 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2009-01-15 14:13:44 -08:00
Brian Behlendorf 2e35cc0802 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2009-01-15 14:13:43 -08:00
Brian Behlendorf 551838a6c8 Resolve conflict with removed cleaner type 2009-01-15 14:13:39 -08:00
Brian Behlendorf b633e4f669 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-01-15 14:11:26 -08:00
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -08:00
Brian Behlendorf d1e802ec14 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-14 13:45:30 -08:00
Brian Behlendorf a7e8d5a15a Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-14 13:45:30 -08:00
Brian Behlendorf 95576ca7a8 Update topmsg 2009-01-14 13:41:28 -08:00
Brian Behlendorf fe0f26150a Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-13 16:06:24 -08:00
Brian Behlendorf e1632568f1 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 16:06:23 -08:00
Brian Behlendorf be0b4029db Initialize list links 2009-01-13 16:02:19 -08:00
Brian Behlendorf 3f5fdfbf8b Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-13 15:33:59 -08:00
Brian Behlendorf 43cd437415 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 15:33:59 -08:00
Brian Behlendorf 94944fab96 Fix proper list node initialization 2009-01-13 15:31:58 -08:00
Brian Behlendorf cad99cbd51 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-13 15:07:06 -08:00
Brian Behlendorf 2e9cd667d0 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-01-13 15:07:06 -08:00
Brian Behlendorf fcd2296399 Additional rw_lock not being initialized cleaned in updated code 2009-01-13 15:05:02 -08:00
Brian Behlendorf 02821c5819 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-13 15:02:10 -08:00
Brian Behlendorf 6c96fc31e9 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 15:02:10 -08:00
Brian Behlendorf bec036636e List cleanup and use of list_node_init initializer 2009-01-13 15:00:12 -08:00
Brian Behlendorf 76151804d7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-13 14:18:09 -08:00
Brian Behlendorf c6f1eca44b Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 14:18:09 -08:00
Brian Behlendorf 2ea04834bf Remove assertion for now 2009-01-13 14:16:11 -08:00
Brian Behlendorf 12b7ed892c Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-13 14:14:22 -08:00
Brian Behlendorf d8561dd52a Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 14:14:22 -08:00
Brian Behlendorf c638d63e0e New TopGit dependency: fix-list 2009-01-13 14:14:20 -08:00
Brian Behlendorf 877f035097 Add topmsg 2009-01-13 14:14:11 -08:00
Brian Behlendorf 20bc74fccf Remove dependency 2009-01-13 14:11:50 -08:00
Brian Behlendorf c4f7d991f6 New TopGit dependency: fix-list 2009-01-13 14:08:14 -08:00
Brian Behlendorf eea2f939cb Remove fix-list 2009-01-13 14:06:30 -08:00
Brian Behlendorf f7295e4683 New TopGit dependency: fix-list 2009-01-13 13:47:51 -08:00
Brian Behlendorf 7a187ce223 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-05 12:08:55 -08:00