877bb02a78
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-05-28 13:54:53 -07:00
f6df7f8782
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-05-28 13:54:53 -07:00
683c459a72
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-05-28 13:54:53 -07:00
2b40ca1456
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-05-28 13:54:52 -07:00
0f28de26db
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-05-28 13:54:52 -07:00
6c1f1ca76b
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
...
Conflicts:
lib/libzfs/libzfs_sendrecv.c
2010-05-28 13:54:49 -07:00
0c7850b688
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-05-28 13:54:13 -07:00
016808b9e9
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-05-28 13:54:12 -07:00
2c67a5a29d
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-05-28 13:54:12 -07:00
c53061c5af
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-05-28 13:54:12 -07:00
4bcccd352e
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-05-28 13:54:11 -07:00
89089d1e4b
Merge commit 'refs/top-bases/fix-stack' into fix-stack
...
Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa_history.c
2010-05-28 13:54:08 -07:00
be688941e5
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-05-28 13:52:55 -07:00
0d4d1a7861
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
...
Conflicts:
module/zfs/dsl_dataset.c
2010-05-28 13:52:52 -07:00
39f5f90c1a
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-05-28 13:52:29 -07:00
0c6ebd6b14
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-05-28 13:52:29 -07:00
24fc842bea
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-05-28 13:52:28 -07:00
0a7f819adf
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-05-28 13:52:28 -07:00
141b42bae9
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-05-28 13:52:28 -07:00
d9e977d23b
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-05-28 13:52:27 -07:00
64420d9573
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-05-28 13:52:27 -07:00
1a55aa78e7
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
...
Conflicts:
module/zfs/dnode.c
2010-05-28 13:52:23 -07:00
31630287ca
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dsl_dataset.c
module/zfs/spa_history.c
2010-05-28 13:51:29 -07:00
ab1a68b225
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
...
Conflicts:
module/zfs/dnode_sync.c
2010-05-28 13:46:45 -07:00
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
2c2cc18ae1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:45:41 -07:00
3dc76b991d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-05-28 12:45:41 -07:00
1d715125b6
Remove gcc-shadow from gcc-branch
2010-05-28 12:44:01 -07:00
06da6ccf97
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:42:30 -07:00
818eafca5b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-05-28 12:42:30 -07:00
73bd7b144f
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-05-28 12:42:30 -07:00
c91169c7c5
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
...
Conflicts:
lib/libzfs/libzfs_util.c
2010-05-28 12:42:27 -07:00
fb72c6ef81
Revert gcc-shadow using -Wno-shadow I can live with
...
While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts. Anyway, this ends up being
more simply gratutous change than I care for.
2010-05-28 12:34:45 -07:00
65b4821860
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:23:57 -07:00
c07f84d10e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 12:23:57 -07:00
062e85a7c6
Remove fix-get-configs dependency from fix-branch
2010-05-28 12:21:44 -07:00
01123eabf6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:20:31 -07:00
fcfae8fbee
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-05-28 12:20:30 -07:00
8390fe4b4b
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 12:20:30 -07:00
f1e299054c
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-05-28 12:20:30 -07:00
c37d6443a4
Revert fix-get-configs should no longer be needed
2010-05-28 12:18:45 -07:00
3c2eb55c13
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 10:24:56 -07:00
ad342f9c21
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 10:24:56 -07:00
a5e72e009e
Remove fix-dsl_pool_t dependency from fix-branch
2010-05-28 10:18:41 -07:00
3450d1f3b5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 10:14:43 -07:00
af051f1250
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 10:14:43 -07:00
157df8338c
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-05-28 10:14:42 -07:00
32a6c32c9f
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-05-28 10:14:42 -07:00
9eec97e163
Revert fix-dsl_pool_t fixed upstream
2010-05-28 10:08:02 -07:00
c2c3358a6f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 10:00:44 -07:00
Brian Behlendorf