Commit Graph

935 Commits

Author SHA1 Message Date
Brian Behlendorf b80664a1fb Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-11 11:26:37 -08:00
Brian Behlendorf 4dc7ff26b4 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2008-12-11 11:26:32 -08:00
Brian Behlendorf 632cbd733d Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-11 11:26:31 -08:00
Brian Behlendorf dd531d887a Merge branch 'fix-locks' into refs/top-bases/fix-branch 2008-12-11 11:26:26 -08:00
Brian Behlendorf f421307e1b Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-11 11:26:25 -08:00
Brian Behlendorf 4ceb3240cd Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2008-12-11 11:26:20 -08:00
Brian Behlendorf 3053990c38 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-11 11:26:19 -08:00
Brian Behlendorf dcf692f9b9 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2008-12-11 11:26:14 -08:00
Brian Behlendorf 6cc611850a Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-11 11:26:13 -08:00
Brian Behlendorf ad55539f56 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-11 11:26:08 -08:00
Brian Behlendorf 627daeca18 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2008-12-11 11:26:08 -08:00
Brian Behlendorf e363f54897 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2008-12-11 11:26:03 -08:00
Brian Behlendorf fc3c415441 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-11 11:26:02 -08:00
Brian Behlendorf d716efa009 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2008-12-11 11:25:57 -08:00
Brian Behlendorf 3f2453fea7 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-11 11:25:56 -08:00
Brian Behlendorf 84e65c5c1e Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 11:25:50 -08:00
Brian Behlendorf d00b912ed9 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-11 11:25:48 -08:00
Brian Behlendorf b453b61272 Fix libspl move to the wrong place 2008-12-11 11:22:02 -08:00
Brian Behlendorf 4b7ee081ce Fix typo 2008-12-11 11:16:38 -08:00
Brian Behlendorf 77755a5771 Add a few missing files 2008-12-11 11:14:49 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
Brian Behlendorf 85ea8b289c Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2008-12-10 12:46:03 -08:00
Brian Behlendorf 57fafe1d3a Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2008-12-10 12:46:01 -08:00
Brian Behlendorf 877be4442a Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-10 12:45:58 -08:00
Brian Behlendorf affaaad5b3 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-10 12:45:57 -08:00
Brian Behlendorf ac79d55dd1 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2008-12-10 12:45:55 -08:00
Brian Behlendorf bd750373a9 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-10 12:45:54 -08:00
Brian Behlendorf f6d6e6ec02 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-10 12:45:52 -08:00
Brian Behlendorf 6921187bfe Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-10 12:45:51 -08:00
Brian Behlendorf 0b7fd980f4 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2008-12-10 12:45:49 -08:00
Brian Behlendorf 374e693c48 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-10 12:45:48 -08:00
Brian Behlendorf 757841de5b Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2008-12-10 12:45:45 -08:00
Brian Behlendorf 68949a97b9 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-10 12:45:44 -08:00
Brian Behlendorf 0b2a6d04f7 Merge branch 'fix-locks' into refs/top-bases/fix-branch 2008-12-10 12:45:41 -08:00
Brian Behlendorf aa79842875 Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-10 12:45:40 -08:00
Brian Behlendorf 44ba72df88 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2008-12-10 12:45:38 -08:00
Brian Behlendorf bef0d6c0f7 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-10 12:45:37 -08:00
Brian Behlendorf b3ddd7dbbb Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-10 12:45:35 -08:00
Brian Behlendorf e27935e1fa Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2008-12-10 12:45:35 -08:00
Brian Behlendorf a63c8654c0 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2008-12-10 12:45:33 -08:00
Brian Behlendorf 68f43fe185 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-10 12:45:32 -08:00
Brian Behlendorf 97ee60ceff Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2008-12-10 12:45:30 -08:00
Brian Behlendorf 968ea539bc Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-10 12:45:29 -08:00
Brian Behlendorf 96cd1ebed4 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2008-12-10 12:45:26 -08:00
Brian Behlendorf c30141ac2e Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-10 12:45:25 -08:00
Brian Behlendorf cea3a92356 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-10 12:45:23 -08:00
Brian Behlendorf bbb1a0ebaf Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-10 12:45:22 -08:00
Brian Behlendorf 9e8b1e836c Remove libumem, we will try and remove this dependency entirely. If we can't then the best move will simply be to use the official library, or build it as a convenience library 2008-12-10 12:43:20 -08:00
Brian Behlendorf abc04c23a5 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2008-12-09 14:16:33 -08:00
Brian Behlendorf 627f9a3296 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2008-12-09 14:16:33 -08:00