]>
granicus.if.org Git - zfs/log
Brian Behlendorf [Tue, 18 May 2010 17:43:15 +0000 (10:43 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
Brian Behlendorf [Tue, 18 May 2010 17:42:54 +0000 (10:42 -0700)]
Resolve conflict
Brian Behlendorf [Tue, 18 May 2010 17:39:21 +0000 (10:39 -0700)]
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:20 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:19 +0000 (10:39 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:19 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Tue, 18 May 2010 17:39:19 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Tue, 18 May 2010 17:39:17 +0000 (10:39 -0700)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:17 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Tue, 18 May 2010 17:39:14 +0000 (10:39 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:13 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/fix-branch' into fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:13 +0000 (10:39 -0700)]
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:12 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
Brian Behlendorf [Tue, 18 May 2010 17:39:11 +0000 (10:39 -0700)]
Merge branch 'fix-acl' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:11 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/fix-acl' into fix-acl
Brian Behlendorf [Tue, 18 May 2010 17:39:10 +0000 (10:39 -0700)]
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:10 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
Brian Behlendorf [Tue, 18 May 2010 17:39:09 +0000 (10:39 -0700)]
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:08 +0000 (10:39 -0700)]
Merge branch 'fix-list' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:08 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
Brian Behlendorf [Tue, 18 May 2010 17:39:07 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/fix-list' into fix-list
Brian Behlendorf [Tue, 18 May 2010 17:39:06 +0000 (10:39 -0700)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:06 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
Brian Behlendorf [Tue, 18 May 2010 17:39:05 +0000 (10:39 -0700)]
Merge branch 'fix-stack' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:04 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/fix-stack' into fix-stack
Brian Behlendorf [Tue, 18 May 2010 17:39:03 +0000 (10:39 -0700)]
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:03 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
Brian Behlendorf [Tue, 18 May 2010 17:39:01 +0000 (10:39 -0700)]
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:39:01 +0000 (10:39 -0700)]
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
Brian Behlendorf [Tue, 18 May 2010 17:39:00 +0000 (10:39 -0700)]
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:59 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
Brian Behlendorf [Tue, 18 May 2010 17:38:58 +0000 (10:38 -0700)]
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:58 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
Brian Behlendorf [Tue, 18 May 2010 17:38:57 +0000 (10:38 -0700)]
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:57 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
Brian Behlendorf [Tue, 18 May 2010 17:38:56 +0000 (10:38 -0700)]
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:55 +0000 (10:38 -0700)]
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:55 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
Brian Behlendorf [Tue, 18 May 2010 17:38:54 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
Brian Behlendorf [Tue, 18 May 2010 17:38:53 +0000 (10:38 -0700)]
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:53 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
Brian Behlendorf [Tue, 18 May 2010 17:38:52 +0000 (10:38 -0700)]
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:51 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
Brian Behlendorf [Tue, 18 May 2010 17:38:46 +0000 (10:38 -0700)]
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:46 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:45 +0000 (10:38 -0700)]
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:44 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
Brian Behlendorf [Tue, 18 May 2010 17:38:42 +0000 (10:38 -0700)]
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:41 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
Brian Behlendorf [Tue, 18 May 2010 17:38:39 +0000 (10:38 -0700)]
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:38 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Brian Behlendorf [Tue, 18 May 2010 17:38:36 +0000 (10:38 -0700)]
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:35 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
Brian Behlendorf [Tue, 18 May 2010 17:38:33 +0000 (10:38 -0700)]
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:32 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
Brian Behlendorf [Tue, 18 May 2010 17:38:30 +0000 (10:38 -0700)]
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:29 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
Brian Behlendorf [Tue, 18 May 2010 17:38:27 +0000 (10:38 -0700)]
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:25 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Brian Behlendorf [Tue, 18 May 2010 17:38:23 +0000 (10:38 -0700)]
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:22 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
Brian Behlendorf [Tue, 18 May 2010 17:38:20 +0000 (10:38 -0700)]
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:19 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
Brian Behlendorf [Tue, 18 May 2010 17:38:17 +0000 (10:38 -0700)]
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:16 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
Brian Behlendorf [Tue, 18 May 2010 17:38:14 +0000 (10:38 -0700)]
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:13 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
Brian Behlendorf [Tue, 18 May 2010 17:38:11 +0000 (10:38 -0700)]
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:09 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
Brian Behlendorf [Tue, 18 May 2010 17:38:07 +0000 (10:38 -0700)]
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:06 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
Brian Behlendorf [Tue, 18 May 2010 17:38:04 +0000 (10:38 -0700)]
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:03 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Brian Behlendorf [Tue, 18 May 2010 17:32:23 +0000 (10:32 -0700)]
Update COPYRIGHT and DISCLAIMER.
Update the COPYRIGHT and DISCLAIMER in an attempt to be clear about
the copyright and licensing issues.
Brian Behlendorf [Tue, 18 May 2010 17:08:29 +0000 (10:08 -0700)]
Minor spec file cleanup for srpm case.
Ensure kpkg is defined is srpm case before using it to define
the krequires macro. Interestingly this is not an issue for
rpm-4.7.1-4 but it is for rpm-4.4.2.3-18.
Brian Behlendorf [Fri, 14 May 2010 18:57:48 +0000 (11:57 -0700)]
Add missing include path for FMA aware zpool command.
Brian Behlendorf [Fri, 14 May 2010 17:55:02 +0000 (10:55 -0700)]
Add nvpair_alloc_fixed.c in to libnvpair build.
Brian Behlendorf [Thu, 29 Apr 2010 19:32:01 +0000 (12:32 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:32:00 +0000 (12:32 -0700)]
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:32:00 +0000 (12:32 -0700)]
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:31:59 +0000 (12:31 -0700)]
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:24:25 +0000 (12:24 -0700)]
Update build system to include nvpair_alloc_fixed.c.
Brian Behlendorf [Thu, 29 Apr 2010 19:23:12 +0000 (12:23 -0700)]
Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c
Brian Behlendorf [Thu, 29 Apr 2010 19:04:36 +0000 (12:04 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:04:35 +0000 (12:04 -0700)]
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:04:33 +0000 (12:04 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:04:33 +0000 (12:04 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Thu, 29 Apr 2010 19:04:33 +0000 (12:04 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:04:32 +0000 (12:04 -0700)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Thu, 29 Apr 2010 19:04:31 +0000 (12:04 -0700)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:04:30 +0000 (12:04 -0700)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Thu, 29 Apr 2010 19:04:28 +0000 (12:04 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:04:27 +0000 (12:04 -0700)]
Merge commit 'refs/top-bases/fix-branch' into fix-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:04:26 +0000 (12:04 -0700)]
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
Brian Behlendorf [Thu, 29 Apr 2010 19:04:26 +0000 (12:04 -0700)]
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:04:25 +0000 (12:04 -0700)]
Merge branch 'fix-acl' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:04:24 +0000 (12:04 -0700)]
Merge commit 'refs/top-bases/fix-acl' into fix-acl
Brian Behlendorf [Thu, 29 Apr 2010 19:04:23 +0000 (12:04 -0700)]
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
Brian Behlendorf [Thu, 29 Apr 2010 19:04:23 +0000 (12:04 -0700)]
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 29 Apr 2010 19:04:22 +0000 (12:04 -0700)]
Merge branch 'fix-strncat' into refs/top-bases/fix-branch