Brian Behlendorf
|
926b04acba
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:
cmd/ztest/ztest.c
|
2009-07-06 13:17:16 -07:00 |
|
Brian Behlendorf
|
8d4f19348a
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-07-06 13:16:34 -07:00 |
|
Brian Behlendorf
|
2838dba2c4
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-07-06 13:16:32 -07:00 |
|
Brian Behlendorf
|
cd098f87c8
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Conflicts:
cmd/ztest/ztest.c
|
2009-07-06 13:16:29 -07:00 |
|
Brian Behlendorf
|
8795d8f034
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2009-07-06 13:15:43 -07:00 |
|
Brian Behlendorf
|
95ba24ed69
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Conflicts:
cmd/ztest/ztest.c
|
2009-07-06 13:15:35 -07:00 |
|
Brian Behlendorf
|
d369760713
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2009-07-06 13:14:41 -07:00 |
|
Brian Behlendorf
|
4e59805d98
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-07-06 13:14:36 -07:00 |
|
Brian Behlendorf
|
4ac493854e
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-07-06 13:14:20 -07:00 |
|
Brian Behlendorf
|
1851e0622f
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2009-07-06 13:14:18 -07:00 |
|
Brian Behlendorf
|
f6c61972e1
|
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
|
2009-07-06 13:14:18 -07:00 |
|
Brian Behlendorf
|
ab14c47f14
|
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
|
2009-07-06 13:14:13 -07:00 |
|
Brian Behlendorf
|
4de6678930
|
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
|
2009-07-06 13:14:13 -07:00 |
|
Brian Behlendorf
|
5ab66031b7
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-07-06 13:14:08 -07:00 |
|
Brian Behlendorf
|
b21412b008
|
Merge commit 'refs/top-bases/fix-list' into fix-list
Conflicts:
module/zfs/zil.c
|
2009-07-06 13:14:05 -07:00 |
|
Brian Behlendorf
|
02edd0ffc1
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2009-07-06 13:13:25 -07:00 |
|
Brian Behlendorf
|
4539acb1cd
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2009-07-06 13:13:25 -07:00 |
|
Brian Behlendorf
|
c186eae4b9
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2009-07-06 13:13:20 -07:00 |
|
Brian Behlendorf
|
326bb586bd
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2009-07-06 13:13:20 -07:00 |
|
Brian Behlendorf
|
4749932f63
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2009-07-06 13:13:15 -07:00 |
|
Brian Behlendorf
|
a1e0f402bf
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2009-07-06 13:13:14 -07:00 |
|
Brian Behlendorf
|
ac96ab67ed
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2009-07-06 13:13:05 -07:00 |
|
Brian Behlendorf
|
f3dc6d4e58
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2009-07-06 13:13:05 -07:00 |
|
Brian Behlendorf
|
6f31ab380c
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2009-07-06 13:12:59 -07:00 |
|
Brian Behlendorf
|
9f1627af07
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2009-07-06 13:12:59 -07:00 |
|
Brian Behlendorf
|
e320858042
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2009-07-06 13:12:54 -07:00 |
|
Brian Behlendorf
|
ea95d72db5
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2009-07-06 13:12:54 -07:00 |
|
Brian Behlendorf
|
afaf8092eb
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2009-07-06 13:12:49 -07:00 |
|
Brian Behlendorf
|
2c4280a680
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2009-07-06 13:12:49 -07:00 |
|
Brian Behlendorf
|
4bf249a931
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2009-07-06 13:12:44 -07:00 |
|
Brian Behlendorf
|
eaba5df9af
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2009-07-06 13:12:44 -07:00 |
|
Brian Behlendorf
|
021d679b95
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2009-07-06 13:12:39 -07:00 |
|
Brian Behlendorf
|
75b6de8e83
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2009-07-06 13:12:39 -07:00 |
|
Brian Behlendorf
|
f8f0e924eb
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2009-07-06 13:12:34 -07:00 |
|
Brian Behlendorf
|
5b629493e0
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2009-07-06 13:12:34 -07:00 |
|
Brian Behlendorf
|
01c3cfc58f
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Conflicts:
module/zfs/zil.c
|
2009-07-06 13:12:23 -07:00 |
|
Brian Behlendorf
|
3ada0935a3
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2009-07-06 13:11:56 -07:00 |
|
Brian Behlendorf
|
a1ccb00b7e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:
cmd/ztest/ztest.c
module/zfs/zil.c
|
2009-07-06 13:11:34 -07:00 |
|
Brian Behlendorf
|
697153c6bb
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-07-02 17:08:38 -07:00 |
|
Brian Behlendorf
|
205e37a6d5
|
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
|
2009-07-02 17:08:36 -07:00 |
|
Brian Behlendorf
|
dbaf4f6c0f
|
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
Conflicts:
cmd/ztest/ztest.c
|
2009-07-02 17:08:30 -07:00 |
|
Brian Behlendorf
|
5ca5c12aa7
|
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
|
2009-07-02 17:07:59 -07:00 |
|
Brian Behlendorf
|
480b03791d
|
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
Conflicts:
lib/libzfs/libzfs_dataset.c
|
2009-07-02 17:07:52 -07:00 |
|
Brian Behlendorf
|
c66757e332
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
Conflicts:
module/zfs/fletcher.c
|
2009-07-02 17:07:06 -07:00 |
|
Brian Behlendorf
|
a06a428e15
|
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Conflicts:
cmd/zdb/zdb_il.c
cmd/zinject/zinject.c
lib/libzfs/libzfs_graph.c
module/zcommon/include/sys/fm/fs/zfs.h
module/zcommon/include/zfs_deleg.h
module/zcommon/include/zfs_namecheck.h
module/zcommon/zfs_deleg.c
module/zcommon/zfs_namecheck.c
module/zcommon/zprop_common.c
module/zfs/dmu_object.c
module/zfs/dsl_prop.c
module/zfs/fletcher.c
module/zfs/include/sys/dsl_deleg.h
module/zfs/include/sys/dsl_prop.h
module/zfs/include/sys/metaslab_impl.h
module/zfs/include/sys/spa_boot.h
module/zfs/include/sys/zap.h
module/zfs/include/sys/zap_impl.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ctldir.h
module/zfs/include/sys/zfs_dir.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/spa_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
|
2009-07-02 17:06:20 -07:00 |
|
Brian Behlendorf
|
091947219a
|
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
|
2009-07-02 16:59:48 -07:00 |
|
Brian Behlendorf
|
bc330e731d
|
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
|
2009-07-02 16:59:46 -07:00 |
|
Brian Behlendorf
|
8fd3bf3283
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2009-07-02 16:59:43 -07:00 |
|
Brian Behlendorf
|
244d656e28
|
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
Conflicts:
module/zfs/dmu.c
|
2009-07-02 16:59:39 -07:00 |
|
Brian Behlendorf
|
32dbbf89a4
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2009-07-02 16:58:37 -07:00 |