]>
granicus.if.org Git - zfs/log
Brian Behlendorf [Thu, 27 May 2010 23:13:19 +0000 (16:13 -0700)]
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:
cmd/ztest/ztest.c
Brian Behlendorf [Thu, 27 May 2010 21:25:06 +0000 (14:25 -0700)]
Revert all remaining changes.
Brian Behlendorf [Thu, 27 May 2010 21:15:08 +0000 (14:15 -0700)]
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Thu, 27 May 2010 21:15:07 +0000 (14:15 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 27 May 2010 21:15:07 +0000 (14:15 -0700)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 27 May 2010 21:12:59 +0000 (14:12 -0700)]
Revert feature-zap-cursor-to-key feature upstream
We can drop this feature and we will pick up the lastest version
during the b141 update.
Brian Behlendorf [Thu, 27 May 2010 20:57:16 +0000 (13:57 -0700)]
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Thu, 27 May 2010 20:54:07 +0000 (13:54 -0700)]
Remove feature-pthreads topic branch
Brian Behlendorf [Thu, 27 May 2010 20:42:00 +0000 (13:42 -0700)]
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Thu, 27 May 2010 20:40:15 +0000 (13:40 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 27 May 2010 20:40:14 +0000 (13:40 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 27 May 2010 20:40:14 +0000 (13:40 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Thu, 27 May 2010 20:39:17 +0000 (13:39 -0700)]
Revert feature-commit-cb feature upstream
We can drop this feature and we will pick up the lastest version
during the b141 update.
Brian Behlendorf [Thu, 27 May 2010 20:32:58 +0000 (13:32 -0700)]
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Thu, 27 May 2010 20:30:48 +0000 (13:30 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch
Conflicts:
cmd/ztest/ztest.c
lib/libzpool/include/sys/zfs_context.h
lib/libzpool/kernel.c
lib/libzpool/taskq.c
Brian Behlendorf [Thu, 27 May 2010 20:25:20 +0000 (13:25 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 27 May 2010 20:23:58 +0000 (13:23 -0700)]
Remove feature-pthreads prior to b141 update.
The pthreads change will need to be reworked and reapplied.
This will be easier to do from scratch rather than sort out
the merge.
Brian Behlendorf [Tue, 18 May 2010 22:01:11 +0000 (15:01 -0700)]
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Tue, 18 May 2010 22:01:09 +0000 (15:01 -0700)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Tue, 18 May 2010 22:01:09 +0000 (15:01 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 18 May 2010 22:01:09 +0000 (15:01 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 18 May 2010 22:01:09 +0000 (15:01 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Tue, 18 May 2010 22:01:07 +0000 (15:01 -0700)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Tue, 18 May 2010 22:01:07 +0000 (15:01 -0700)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 18 May 2010 22:01:05 +0000 (15:01 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Tue, 18 May 2010 22:01:03 +0000 (15:01 -0700)]
Merge commit 'refs/top-bases/fix-branch' into fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:01:03 +0000 (15:01 -0700)]
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:01:02 +0000 (15:01 -0700)]
Merge branch 'fix-acl' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:01:02 +0000 (15:01 -0700)]
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
Brian Behlendorf [Tue, 18 May 2010 22:01:01 +0000 (15:01 -0700)]
Merge commit 'refs/top-bases/fix-acl' into fix-acl
Brian Behlendorf [Tue, 18 May 2010 22:01:00 +0000 (15:01 -0700)]
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:01:00 +0000 (15:01 -0700)]
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
Brian Behlendorf [Tue, 18 May 2010 22:00:59 +0000 (15:00 -0700)]
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:59 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
Brian Behlendorf [Tue, 18 May 2010 22:00:58 +0000 (15:00 -0700)]
Merge branch 'fix-list' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:57 +0000 (15:00 -0700)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:57 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-list' into fix-list
Brian Behlendorf [Tue, 18 May 2010 22:00:56 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
Brian Behlendorf [Tue, 18 May 2010 22:00:55 +0000 (15:00 -0700)]
Merge branch 'fix-stack' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:55 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-stack' into fix-stack
Brian Behlendorf [Tue, 18 May 2010 22:00:54 +0000 (15:00 -0700)]
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:54 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
Brian Behlendorf [Tue, 18 May 2010 22:00:53 +0000 (15:00 -0700)]
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:53 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
Brian Behlendorf [Tue, 18 May 2010 22:00:52 +0000 (15:00 -0700)]
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:51 +0000 (15:00 -0700)]
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:51 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
Brian Behlendorf [Tue, 18 May 2010 22:00:50 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
Brian Behlendorf [Tue, 18 May 2010 22:00:49 +0000 (15:00 -0700)]
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:49 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
Brian Behlendorf [Tue, 18 May 2010 22:00:48 +0000 (15:00 -0700)]
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:48 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
Brian Behlendorf [Tue, 18 May 2010 22:00:47 +0000 (15:00 -0700)]
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:47 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
Brian Behlendorf [Tue, 18 May 2010 22:00:46 +0000 (15:00 -0700)]
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:45 +0000 (15:00 -0700)]
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:45 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
Brian Behlendorf [Tue, 18 May 2010 22:00:44 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
Brian Behlendorf [Tue, 18 May 2010 22:00:39 +0000 (15:00 -0700)]
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:39 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:38 +0000 (15:00 -0700)]
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:37 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
Brian Behlendorf [Tue, 18 May 2010 22:00:35 +0000 (15:00 -0700)]
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:34 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
Brian Behlendorf [Tue, 18 May 2010 22:00:32 +0000 (15:00 -0700)]
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:32 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Brian Behlendorf [Tue, 18 May 2010 22:00:30 +0000 (15:00 -0700)]
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:28 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
Brian Behlendorf [Tue, 18 May 2010 22:00:27 +0000 (15:00 -0700)]
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:25 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
Brian Behlendorf [Tue, 18 May 2010 22:00:24 +0000 (15:00 -0700)]
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:23 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
Brian Behlendorf [Tue, 18 May 2010 22:00:21 +0000 (15:00 -0700)]
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:20 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Brian Behlendorf [Tue, 18 May 2010 22:00:18 +0000 (15:00 -0700)]
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:17 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
Brian Behlendorf [Tue, 18 May 2010 22:00:15 +0000 (15:00 -0700)]
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:13 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
Brian Behlendorf [Tue, 18 May 2010 22:00:12 +0000 (15:00 -0700)]
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:10 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
Brian Behlendorf [Tue, 18 May 2010 22:00:09 +0000 (15:00 -0700)]
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:08 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
Brian Behlendorf [Tue, 18 May 2010 22:00:06 +0000 (15:00 -0700)]
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:04 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
Brian Behlendorf [Tue, 18 May 2010 22:00:02 +0000 (15:00 -0700)]
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:00 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
Brian Behlendorf [Tue, 18 May 2010 21:59:58 +0000 (14:59 -0700)]
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:59:57 +0000 (14:59 -0700)]
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Brian Behlendorf [Tue, 18 May 2010 21:55:01 +0000 (14:55 -0700)]
Add AUTHORS to master branch
Brian Behlendorf [Tue, 18 May 2010 21:33:40 +0000 (14:33 -0700)]
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:39 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:38 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Tue, 18 May 2010 21:33:38 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Tue, 18 May 2010 21:33:38 +0000 (14:33 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:37 +0000 (14:33 -0700)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:36 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Tue, 18 May 2010 21:33:33 +0000 (14:33 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:32 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-branch' into fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:32 +0000 (14:33 -0700)]
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:31 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
projects / zfs / log