Brian Behlendorf
|
319f69734b
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:
cmd/ztest/ztest.c
|
2010-05-27 16:13:19 -07:00 |
|
Brian Behlendorf
|
390995db28
|
Revert all remaining changes.
|
2010-05-27 14:25:06 -07:00 |
|
Brian Behlendorf
|
b265da19f0
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-05-27 14:15:08 -07:00 |
|
Brian Behlendorf
|
c7742fd698
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2010-05-27 14:15:07 -07:00 |
|
Brian Behlendorf
|
5c16b9898b
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2010-05-27 14:15:07 -07:00 |
|
Brian Behlendorf
|
b754295dec
|
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.
|
2010-05-27 14:12:59 -07:00 |
|
Brian Behlendorf
|
249ae381e1
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-05-27 13:57:16 -07:00 |
|
Brian Behlendorf
|
262c747b4c
|
Remove feature-pthreads topic branch
|
2010-05-27 13:54:07 -07:00 |
|
Brian Behlendorf
|
d8e5eb56b8
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-05-27 13:42:00 -07:00 |
|
Brian Behlendorf
|
cde6e6fec8
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2010-05-27 13:40:15 -07:00 |
|
Brian Behlendorf
|
1dc4235011
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2010-05-27 13:40:14 -07:00 |
|
Brian Behlendorf
|
ca50214549
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2010-05-27 13:40:14 -07:00 |
|
Brian Behlendorf
|
1e32b3c781
|
Revert feature-commit-cb feature upstream
We can drop this feature and we will pick up the lastest version
during the b141 update.
|
2010-05-27 13:39:17 -07:00 |
|
Brian Behlendorf
|
c17d3e05eb
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-05-27 13:32:58 -07:00 |
|
Brian Behlendorf
|
a082023842
|
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
|
2010-05-27 13:30:48 -07:00 |
|
Brian Behlendorf
|
3bd93e7103
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2010-05-27 13:25:20 -07:00 |
|
Brian Behlendorf
|
099e8e493a
|
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.
|
2010-05-27 13:23:58 -07:00 |
|
Brian Behlendorf
|
e169ec5315
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-05-18 15:01:11 -07:00 |
|
Brian Behlendorf
|
8e65e1c40b
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2010-05-18 15:01:09 -07:00 |
|
Brian Behlendorf
|
00f9eadea4
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2010-05-18 15:01:09 -07:00 |
|
Brian Behlendorf
|
83051bdf63
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2010-05-18 15:01:09 -07:00 |
|
Brian Behlendorf
|
6c4c07e314
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2010-05-18 15:01:09 -07:00 |
|
Brian Behlendorf
|
7d55c4f47a
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2010-05-18 15:01:07 -07:00 |
|
Brian Behlendorf
|
0db2bcbcd5
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2010-05-18 15:01:07 -07:00 |
|
Brian Behlendorf
|
1fa85ba793
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2010-05-18 15:01:05 -07:00 |
|
Brian Behlendorf
|
eb03ee363a
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2010-05-18 15:01:03 -07:00 |
|
Brian Behlendorf
|
1587b4b366
|
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
|
2010-05-18 15:01:03 -07:00 |
|
Brian Behlendorf
|
923e1bad7f
|
Merge branch 'fix-acl' into refs/top-bases/fix-branch
|
2010-05-18 15:01:02 -07:00 |
|
Brian Behlendorf
|
a050659724
|
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
|
2010-05-18 15:01:02 -07:00 |
|
Brian Behlendorf
|
56abf9a10f
|
Merge commit 'refs/top-bases/fix-acl' into fix-acl
|
2010-05-18 15:01:01 -07:00 |
|
Brian Behlendorf
|
8b7b401717
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2010-05-18 15:01:00 -07:00 |
|
Brian Behlendorf
|
13493e3166
|
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
|
2010-05-18 15:01:00 -07:00 |
|
Brian Behlendorf
|
3666b263e0
|
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
|
2010-05-18 15:00:59 -07:00 |
|
Brian Behlendorf
|
4ee7b37f0b
|
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
|
2010-05-18 15:00:59 -07:00 |
|
Brian Behlendorf
|
fa53553fc1
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2010-05-18 15:00:58 -07:00 |
|
Brian Behlendorf
|
202285d64a
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2010-05-18 15:00:57 -07:00 |
|
Brian Behlendorf
|
46c73e7b7a
|
Merge commit 'refs/top-bases/fix-list' into fix-list
|
2010-05-18 15:00:57 -07:00 |
|
Brian Behlendorf
|
d476e932ac
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2010-05-18 15:00:56 -07:00 |
|
Brian Behlendorf
|
4903c7d0e9
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2010-05-18 15:00:55 -07:00 |
|
Brian Behlendorf
|
c670bcacc4
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2010-05-18 15:00:55 -07:00 |
|
Brian Behlendorf
|
9a13227b89
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2010-05-18 15:00:54 -07:00 |
|
Brian Behlendorf
|
e3dccb9279
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2010-05-18 15:00:54 -07:00 |
|
Brian Behlendorf
|
77b455afe7
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2010-05-18 15:00:53 -07:00 |
|
Brian Behlendorf
|
f017b5e433
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2010-05-18 15:00:53 -07:00 |
|
Brian Behlendorf
|
2be44c5dd7
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2010-05-18 15:00:52 -07:00 |
|
Brian Behlendorf
|
f24e2bcaf8
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2010-05-18 15:00:51 -07:00 |
|
Brian Behlendorf
|
6430461823
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2010-05-18 15:00:51 -07:00 |
|
Brian Behlendorf
|
027dccc808
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2010-05-18 15:00:50 -07:00 |
|
Brian Behlendorf
|
b29650b928
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2010-05-18 15:00:49 -07:00 |
|
Brian Behlendorf
|
bca9497a1c
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2010-05-18 15:00:49 -07:00 |