Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity
308 Commits 42 Branches 132 Tags 226 MiB
Commit Graph

308 Commits

Author SHA1 Message Date
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 262c747b4c Remove feature-pthreads topic branch 2010-05-27 13:54:07 -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 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 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 6119cb885a Add AUTHORS to master branch 2010-05-18 14:55:01 -07:00
Brian Behlendorf 9e1398d25d Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-05-18 14:33:39 -07:00
Brian Behlendorf 2b1b4c6878 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-05-18 14:33:38 -07:00
Brian Behlendorf 92b4c4e4cc Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-05-18 14:33:38 -07:00
Brian Behlendorf 18ab1a3634 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-18 14:33:38 -07:00
Brian Behlendorf 4d159b118d Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-05-18 14:33:37 -07:00
Brian Behlendorf 5e840a2f1a Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2010-05-18 14:33:36 -07:00
Brian Behlendorf fa94cf43b9 Update COPYRIGHT to reference zpios CDDL exceptions. 2010-05-18 14:25:28 -07:00
Brian Behlendorf a52727cf3e Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-05-18 11:14:04 -07:00
Brian Behlendorf 78d56178f7 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-18 11:14:04 -07:00
Brian Behlendorf 2b170bc4aa Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-05-18 11:14:03 -07:00
Brian Behlendorf de49a76d60 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-05-18 11:14:03 -07:00
Brian Behlendorf eb262352b9 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-05-18 11:14:02 -07:00
Brian Behlendorf 972604b9de Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2010-05-18 11:14:01 -07:00
Brian Behlendorf 94d52d93d9 Update COPYRIGHT to include release id LLNL-CODE-403049. 2010-05-18 11:06:56 -07:00
Brian Behlendorf daf460d226 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-05-18 10:39:20 -07:00
Brian Behlendorf 8942b41dbe Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-05-18 10:39:19 -07:00
Brian Behlendorf 2ab1e1dcfe Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-05-18 10:39:19 -07:00
Brian Behlendorf 58fc46bef0 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-18 10:39:19 -07:00
Brian Behlendorf 750c70a506 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2010-05-18 10:39:17 -07:00
Brian Behlendorf f110b74bf4 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-05-18 10:39:17 -07:00
Brian Behlendorf 91ac110c9c Update COPYRIGHT and DISCLAIMER. 
Update the COPYRIGHT and DISCLAIMER in an attempt to be clear about
the copyright and licensing issues.
 2010-05-18 10:32:23 -07:00
Brian Behlendorf 620a5ae89b Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-04-29 12:04:33 -07:00
Brian Behlendorf f3017eccb7 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-04-29 12:04:33 -07:00
Brian Behlendorf b9610ade84 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-04-29 12:04:33 -07:00
Brian Behlendorf 7a062682fb Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-04-29 12:04:32 -07:00
Brian Behlendorf 9c10b70375 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-04-29 12:04:31 -07:00
Brian Behlendorf 9d8e4f07ff Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2010-04-29 12:04:30 -07:00
Brian Behlendorf 3affbe6d7e Update nvpair's to include nv_alloc_fixed support 2010-04-29 11:59:41 -07:00
Brian Behlendorf d885028d41 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-04-29 10:41:57 -07:00
Brian Behlendorf ca4ad9f284 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-04-29 10:41:56 -07:00
Brian Behlendorf da940bba2b Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-04-29 10:41:56 -07:00
Brian Behlendorf 9199dc112a Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-04-29 10:41:55 -07:00