]>
granicus.if.org Git - zfs/log
Brian Behlendorf [Wed, 18 Feb 2009 22:29:24 +0000 (14:29 -0800)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:29:23 +0000 (14:29 -0800)]
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
Brian Behlendorf [Wed, 18 Feb 2009 22:29:20 +0000 (14:29 -0800)]
Merge branch 'fix-stack' into refs/top-bases/fix-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:29:19 +0000 (14:29 -0800)]
Merge commit 'refs/top-bases/fix-stack' into fix-stack
Brian Behlendorf [Wed, 18 Feb 2009 22:29:16 +0000 (14:29 -0800)]
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:29:16 +0000 (14:29 -0800)]
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
Brian Behlendorf [Wed, 18 Feb 2009 22:29:12 +0000 (14:29 -0800)]
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:29:08 +0000 (14:29 -0800)]
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
Conflicts:
lib/libzpool/kernel.c
Brian Behlendorf [Wed, 18 Feb 2009 22:28:46 +0000 (14:28 -0800)]
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:28:46 +0000 (14:28 -0800)]
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
Brian Behlendorf [Wed, 18 Feb 2009 22:28:43 +0000 (14:28 -0800)]
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:28:42 +0000 (14:28 -0800)]
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
Brian Behlendorf [Wed, 18 Feb 2009 22:28:39 +0000 (14:28 -0800)]
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:28:38 +0000 (14:28 -0800)]
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
Brian Behlendorf [Wed, 18 Feb 2009 22:28:34 +0000 (14:28 -0800)]
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:28:34 +0000 (14:28 -0800)]
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
Brian Behlendorf [Wed, 18 Feb 2009 22:28:31 +0000 (14:28 -0800)]
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:28:30 +0000 (14:28 -0800)]
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
Brian Behlendorf [Wed, 18 Feb 2009 22:28:28 +0000 (14:28 -0800)]
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:28:27 +0000 (14:28 -0800)]
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
Brian Behlendorf [Wed, 18 Feb 2009 22:28:24 +0000 (14:28 -0800)]
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:28:23 +0000 (14:28 -0800)]
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
Brian Behlendorf [Wed, 18 Feb 2009 22:28:15 +0000 (14:28 -0800)]
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
Brian Behlendorf [Wed, 18 Feb 2009 22:27:31 +0000 (14:27 -0800)]
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
Brian Behlendorf [Wed, 18 Feb 2009 20:51:31 +0000 (12:51 -0800)]
Rebase master to b108
Brian Behlendorf [Tue, 27 Jan 2009 06:01:12 +0000 (22:01 -0800)]
Merge branch 'fix-list' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:12 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/fix-list' into fix-list
Brian Behlendorf [Tue, 27 Jan 2009 06:01:11 +0000 (22:01 -0800)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:10 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
Brian Behlendorf [Tue, 27 Jan 2009 06:01:09 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/fix-stack' into fix-stack
Brian Behlendorf [Tue, 27 Jan 2009 06:01:09 +0000 (22:01 -0800)]
Merge branch 'fix-stack' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:08 +0000 (22:01 -0800)]
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:07 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
Brian Behlendorf [Tue, 27 Jan 2009 06:01:06 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
Brian Behlendorf [Tue, 27 Jan 2009 06:01:06 +0000 (22:01 -0800)]
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:05 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
Brian Behlendorf [Tue, 27 Jan 2009 06:01:05 +0000 (22:01 -0800)]
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:04 +0000 (22:01 -0800)]
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:03 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
Brian Behlendorf [Tue, 27 Jan 2009 06:01:02 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
Brian Behlendorf [Tue, 27 Jan 2009 06:01:02 +0000 (22:01 -0800)]
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:01 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
Brian Behlendorf [Tue, 27 Jan 2009 06:01:01 +0000 (22:01 -0800)]
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:00 +0000 (22:01 -0800)]
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:00:59 +0000 (22:00 -0800)]
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
Brian Behlendorf [Tue, 27 Jan 2009 06:00:58 +0000 (22:00 -0800)]
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
Brian Behlendorf [Tue, 27 Jan 2009 06:00:58 +0000 (22:00 -0800)]
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:00:57 +0000 (22:00 -0800)]
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
Brian Behlendorf [Tue, 27 Jan 2009 06:00:57 +0000 (22:00 -0800)]
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:00:56 +0000 (22:00 -0800)]
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:00:55 +0000 (22:00 -0800)]
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
Brian Behlendorf [Tue, 27 Jan 2009 05:58:32 +0000 (21:58 -0800)]
Refresh type in topgit git://* reference
Brian Behlendorf [Tue, 20 Jan 2009 23:46:23 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-list' into fix-list
Brian Behlendorf [Tue, 20 Jan 2009 23:46:23 +0000 (15:46 -0800)]
Merge branch 'fix-list' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:22 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
Brian Behlendorf [Tue, 20 Jan 2009 23:46:22 +0000 (15:46 -0800)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:21 +0000 (15:46 -0800)]
Merge branch 'fix-stack' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:20 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-stack' into fix-stack
Brian Behlendorf [Tue, 20 Jan 2009 23:46:19 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
Brian Behlendorf [Tue, 20 Jan 2009 23:46:19 +0000 (15:46 -0800)]
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:18 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
Brian Behlendorf [Tue, 20 Jan 2009 23:46:18 +0000 (15:46 -0800)]
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:16 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
Brian Behlendorf [Tue, 20 Jan 2009 23:46:16 +0000 (15:46 -0800)]
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:15 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
Brian Behlendorf [Tue, 20 Jan 2009 23:46:15 +0000 (15:46 -0800)]
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:14 +0000 (15:46 -0800)]
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:13 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
Brian Behlendorf [Tue, 20 Jan 2009 23:46:12 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
Brian Behlendorf [Tue, 20 Jan 2009 23:46:12 +0000 (15:46 -0800)]
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:11 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
Brian Behlendorf [Tue, 20 Jan 2009 23:46:11 +0000 (15:46 -0800)]
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:10 +0000 (15:46 -0800)]
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:09 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
Brian Behlendorf [Tue, 20 Jan 2009 23:46:08 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
Brian Behlendorf [Tue, 20 Jan 2009 23:46:08 +0000 (15:46 -0800)]
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:07 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
Brian Behlendorf [Tue, 20 Jan 2009 23:46:07 +0000 (15:46 -0800)]
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:43:44 +0000 (15:43 -0800)]
Add GIT to master
Brian Behlendorf [Fri, 16 Jan 2009 00:30:25 +0000 (16:30 -0800)]
Merge branch 'fix-locks' into refs/top-bases/fix-branch
Brian Behlendorf [Fri, 16 Jan 2009 00:25:25 +0000 (16:25 -0800)]
All init and destroy initialized pulled in
Brian Behlendorf [Fri, 16 Jan 2009 00:22:23 +0000 (16:22 -0800)]
txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions
Brian Behlendorf [Thu, 15 Jan 2009 23:54:33 +0000 (15:54 -0800)]
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 15 Jan 2009 23:52:12 +0000 (15:52 -0800)]
Fix pthreads prototype
Brian Behlendorf [Thu, 15 Jan 2009 22:16:15 +0000 (14:16 -0800)]
Merge branch 'fix-list' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 15 Jan 2009 22:16:14 +0000 (14:16 -0800)]
Merge commit 'refs/top-bases/fix-list' into fix-list
Brian Behlendorf [Thu, 15 Jan 2009 22:16:12 +0000 (14:16 -0800)]
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
Brian Behlendorf [Thu, 15 Jan 2009 22:16:12 +0000 (14:16 -0800)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 15 Jan 2009 22:16:10 +0000 (14:16 -0800)]
Merge branch 'fix-stack' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 15 Jan 2009 22:16:09 +0000 (14:16 -0800)]
Merge commit 'refs/top-bases/fix-stack' into fix-stack
Brian Behlendorf [Thu, 15 Jan 2009 22:16:07 +0000 (14:16 -0800)]
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 15 Jan 2009 22:16:06 +0000 (14:16 -0800)]
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
Brian Behlendorf [Thu, 15 Jan 2009 22:16:04 +0000 (14:16 -0800)]
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 15 Jan 2009 22:16:03 +0000 (14:16 -0800)]
Resolve conflict with removed cleaner type
Brian Behlendorf [Thu, 15 Jan 2009 22:15:04 +0000 (14:15 -0800)]
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
Brian Behlendorf [Thu, 15 Jan 2009 22:15:04 +0000 (14:15 -0800)]
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 15 Jan 2009 22:15:01 +0000 (14:15 -0800)]
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
Brian Behlendorf [Thu, 15 Jan 2009 22:15:01 +0000 (14:15 -0800)]
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 15 Jan 2009 22:14:59 +0000 (14:14 -0800)]
Merge branch 'fix-locks' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 15 Jan 2009 22:14:57 +0000 (14:14 -0800)]
Resolve conflict with removed cleaner type
projects / zfs / log