]>
granicus.if.org Git - zfs/log
Brian Behlendorf [Tue, 18 May 2010 21:41:47 +0000 (14:41 -0700)]
Revert accidental change to COPYING, move authors to master branch.
Brian Behlendorf [Tue, 18 May 2010 21:33:41 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-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 branch 'feature-pthreads' into refs/top-bases/feature-branch
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 commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
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 branch 'fix-acl' 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
Brian Behlendorf [Tue, 18 May 2010 21:33:30 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-acl' into fix-acl
Brian Behlendorf [Tue, 18 May 2010 21:33:29 +0000 (14:33 -0700)]
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:29 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
Brian Behlendorf [Tue, 18 May 2010 21:33:28 +0000 (14:33 -0700)]
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:28 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
Brian Behlendorf [Tue, 18 May 2010 21:33:27 +0000 (14:33 -0700)]
Merge branch 'fix-list' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:27 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-list' into fix-list
Brian Behlendorf [Tue, 18 May 2010 21:33:26 +0000 (14:33 -0700)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:25 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
Brian Behlendorf [Tue, 18 May 2010 21:33:24 +0000 (14:33 -0700)]
Merge branch 'fix-stack' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:24 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-stack' into fix-stack
Brian Behlendorf [Tue, 18 May 2010 21:33:23 +0000 (14:33 -0700)]
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:23 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
Brian Behlendorf [Tue, 18 May 2010 21:33:22 +0000 (14:33 -0700)]
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:22 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
Brian Behlendorf [Tue, 18 May 2010 21:33:21 +0000 (14:33 -0700)]
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:20 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
Brian Behlendorf [Tue, 18 May 2010 21:33:19 +0000 (14:33 -0700)]
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:19 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
Brian Behlendorf [Tue, 18 May 2010 21:33:18 +0000 (14:33 -0700)]
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:18 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
Brian Behlendorf [Tue, 18 May 2010 21:33:17 +0000 (14:33 -0700)]
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:16 +0000 (14:33 -0700)]
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:16 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
Brian Behlendorf [Tue, 18 May 2010 21:33:15 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
Brian Behlendorf [Tue, 18 May 2010 21:33:14 +0000 (14:33 -0700)]
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:14 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
Brian Behlendorf [Tue, 18 May 2010 21:33:13 +0000 (14:33 -0700)]
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:13 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
Brian Behlendorf [Tue, 18 May 2010 21:33:08 +0000 (14:33 -0700)]
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:07 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:07 +0000 (14:33 -0700)]
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:06 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
Brian Behlendorf [Tue, 18 May 2010 21:33:04 +0000 (14:33 -0700)]
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:03 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
Brian Behlendorf [Tue, 18 May 2010 21:33:01 +0000 (14:33 -0700)]
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:00 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Brian Behlendorf [Tue, 18 May 2010 21:32:58 +0000 (14:32 -0700)]
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:57 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
Brian Behlendorf [Tue, 18 May 2010 21:32:55 +0000 (14:32 -0700)]
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:54 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
Brian Behlendorf [Tue, 18 May 2010 21:32:52 +0000 (14:32 -0700)]
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:51 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
Brian Behlendorf [Tue, 18 May 2010 21:32:49 +0000 (14:32 -0700)]
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:48 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Brian Behlendorf [Tue, 18 May 2010 21:32:46 +0000 (14:32 -0700)]
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:45 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
Brian Behlendorf [Tue, 18 May 2010 21:32:43 +0000 (14:32 -0700)]
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:41 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
Brian Behlendorf [Tue, 18 May 2010 21:32:39 +0000 (14:32 -0700)]
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:38 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
Brian Behlendorf [Tue, 18 May 2010 21:32:37 +0000 (14:32 -0700)]
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:35 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
Brian Behlendorf [Tue, 18 May 2010 21:32:34 +0000 (14:32 -0700)]
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:32 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
Brian Behlendorf [Tue, 18 May 2010 21:32:30 +0000 (14:32 -0700)]
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:28 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
Brian Behlendorf [Tue, 18 May 2010 21:32:27 +0000 (14:32 -0700)]
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:25 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Brian Behlendorf [Tue, 18 May 2010 21:25:28 +0000 (14:25 -0700)]
Update COPYRIGHT to reference zpios CDDL exceptions.
Brian Behlendorf [Tue, 18 May 2010 19:26:48 +0000 (12:26 -0700)]
Move user-arch.m4 change from linux-libspl to zfs-branch.
Brian Behlendorf [Tue, 18 May 2010 18:14:06 +0000 (11:14 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
Brian Behlendorf [Tue, 18 May 2010 18:14:05 +0000 (11:14 -0700)]
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Tue, 18 May 2010 18:14:04 +0000 (11:14 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 18 May 2010 18:14:04 +0000 (11:14 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 18 May 2010 18:14:03 +0000 (11:14 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Tue, 18 May 2010 18:14:03 +0000 (11:14 -0700)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Tue, 18 May 2010 18:14:02 +0000 (11:14 -0700)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 18 May 2010 18:14:01 +0000 (11:14 -0700)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Tue, 18 May 2010 18:13:59 +0000 (11:13 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:58 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/fix-branch' into fix-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:57 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
Brian Behlendorf [Tue, 18 May 2010 18:13:57 +0000 (11:13 -0700)]
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:56 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/fix-acl' into fix-acl
Brian Behlendorf [Tue, 18 May 2010 18:13:56 +0000 (11:13 -0700)]
Merge branch 'fix-acl' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:55 +0000 (11:13 -0700)]
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:54 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
Brian Behlendorf [Tue, 18 May 2010 18:13:54 +0000 (11:13 -0700)]
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:53 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
Brian Behlendorf [Tue, 18 May 2010 18:13:52 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/fix-list' into fix-list
Brian Behlendorf [Tue, 18 May 2010 18:13:52 +0000 (11:13 -0700)]
Merge branch 'fix-list' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:51 +0000 (11:13 -0700)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:50 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
Brian Behlendorf [Tue, 18 May 2010 18:13:49 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/fix-stack' into fix-stack
Brian Behlendorf [Tue, 18 May 2010 18:13:49 +0000 (11:13 -0700)]
Merge branch 'fix-stack' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:48 +0000 (11:13 -0700)]
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch