5e4f96bb2f
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-11 09:55:42 -08:00
5302158673
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-11 09:55:41 -08:00
2269c6aef0
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-11 09:55:41 -08:00
7d196935b2
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-03-11 09:55:40 -08:00
389bb5a604
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-03-11 09:55:39 -08:00
a20a614a87
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-03-11 09:55:38 -08:00
414f1f975e
Rename update-zfs.sh -> zfs-update.sh for consistency
2010-03-11 09:53:59 -08:00
b3928389da
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-09 14:20:03 -08:00
3907283e25
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-09 14:20:02 -08:00
00cf79214f
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-09 14:20:02 -08:00
9ae782821b
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-03-09 14:20:01 -08:00
c3d51e4110
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-03-09 14:20:00 -08:00
df67dd9d47
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-03-09 14:20:00 -08:00
774f7c02b1
Ignore unsigned module build products
...
Along with the addition of signed kernel modules in newer kernel
we have a few new build products we need to ignore. LKLM has the
whole thread for those interested: http://lkml.org/lkml/2007/2/14/164
2010-03-09 14:14:09 -08:00
e218fd13e8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-09 13:24:28 -08:00
ef359aee66
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-09 13:24:27 -08:00
f2ab1fea36
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-09 13:24:27 -08:00
2b85024275
Use CPU percentages for number of commit cb threads.
...
This doesn't change number of threads in the kernel, but it reduces number of
threads in ztest (important due to 32-bit address limitations).
2010-03-09 13:21:20 -08:00
9a3d5378c6
Clean up emulation of kernel threads in userspace.
...
Updated to use pthread thread specific data rather than keeping
a global list. This also fixes at least one easily reproducible
crash in ztest
2010-03-09 12:25:28 -08:00
710e779a08
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-01-08 11:39:30 -08:00
efd53d2969
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-01-08 11:39:30 -08:00
b991553702
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-01-08 11:39:30 -08:00
a240c39095
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-01-08 11:39:29 -08:00
ee3aa7773b
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-01-08 11:39:28 -08:00
eaf2e3231c
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-01-08 11:39:28 -08:00
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
bd452887b8
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-12-11 16:22:22 -08:00
381e48a2d8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-12-11 16:22:22 -08:00
6d7c81fc7a
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-12-11 16:22:22 -08:00
f2fd9d7728
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-12-11 16:22:21 -08:00
dc64c3498b
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-12-11 16:22:20 -08:00
4a2898bfa0
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-12-11 16:22:19 -08:00
058ac9ba78
Pull in latest man pages as part of update-zfs.sh
...
The script has been updated to download the latest documentations
packages for Solaris and extract the needed ZFS man pages. These
will still need a little markup to handle changes between the
Solaris and Linux versions of ZFS. Howver, they should be pretty
minor I've tried hard to keep the interface the same.
In additional to the script update the zdb, zfs, and zpool man
pages have been added to the repo.
2009-12-11 16:15:33 -08:00
71ccaccb2b
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-11-15 16:27:00 -08:00
368cfaefdb
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-11-15 16:27:00 -08:00
475e214ce1
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-11-15 16:27:00 -08:00
f056747e61
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-11-15 16:27:00 -08:00
65f6d4b712
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-11-15 16:26:58 -08:00
8c5797df77
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-11-15 16:26:58 -08:00
0aa61e8427
Remove zvol.c when updating in update-zfs.sh Linux version available.
2009-11-15 16:20:01 -08:00
ad0f8481d2
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-10-09 15:43:31 -07:00
b60766e22f
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-10-09 15:43:31 -07:00
7698515ec4
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-10-09 15:43:30 -07:00
6df047f11f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-10-09 15:43:30 -07:00
656d8f6b22
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-10-09 15:43:28 -07:00
46fa16ed8c
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-10-09 15:43:28 -07:00
5c36312909
Script update-zfs.sh updated to include libefi library
2009-10-09 15:37:29 -07:00
799792cf1c
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-08-18 12:10:49 -07:00
8aab887b7c
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-08-18 12:10:47 -07:00
33143ae6ad
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-08-18 12:10:47 -07:00
Brian Behlendorf
Ricardo M. Correia