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
08465a2ab4
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-05-18 15:00:45 -07:00
6119cb885a
Add AUTHORS to master branch
2010-05-18 14:55:01 -07:00
ac7032b809
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-05-18 14:33:14 -07:00
fa94cf43b9
Update COPYRIGHT to reference zpios CDDL exceptions.
2010-05-18 14:25:28 -07:00
a8c26f8852
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-05-18 11:13:38 -07:00
94d52d93d9
Update COPYRIGHT to include release id LLNL-CODE-403049.
2010-05-18 11:06:56 -07:00
6bcbd721e8
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-05-18 10:38:53 -07:00
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
e5edc5104d
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-04-29 12:04:04 -07:00
3affbe6d7e
Update nvpair's to include nv_alloc_fixed support
2010-04-29 11:59:41 -07:00
86049947d8
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-04-29 10:41:24 -07:00
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
3f5b4e49ba
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-03-11 09:55:13 -08:00
414f1f975e
Rename update-zfs.sh -> zfs-update.sh for consistency
2010-03-11 09:53:59 -08:00
881d65ec2b
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-03-09 14:19:37 -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
68fc990a4b
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-01-08 11:39:16 -08:00
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
15727a4121
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-12-11 16:21:55 -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
dcd4d95764
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-11-15 16:26:37 -08:00
0aa61e8427
Remove zvol.c when updating in update-zfs.sh Linux version available.
2009-11-15 16:20:01 -08:00
e3ad5a40f6
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-10-09 15:43:01 -07:00
5c36312909
Script update-zfs.sh updated to include libefi library
2009-10-09 15:37:29 -07:00
b330ab77df
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-08-18 12:09:14 -07:00
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
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
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
d190a5b9bd
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-02-18 14:28:23 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
cc6db38461
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-01-26 22:00:57 -08:00
c65e71073f
Refresh type in topgit git://* reference
2009-01-26 21:58:32 -08:00
341241f77c
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-01-20 15:46:08 -08:00
4710ede86a
Add GIT to master
2009-01-20 15:43:44 -08:00
2e35cc0802
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-01-15 14:13:43 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
491e2d036a
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-01-05 12:08:20 -08:00
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
266a9cfeb5
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-01-05 11:11:36 -08:00
36b849fa51
Remove zdump, it's an unrelateds command which I added simply due to the z* command convention
2009-01-05 11:10:13 -08:00
6caaa9d2b1
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-12-12 13:46:38 -08:00
810db7e0a2
Remove zcommon reference merged in to zpool
2008-12-12 13:41:20 -08:00
f81e0e700d
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-12-11 15:40:26 -08:00
6b2c60acca
Moving lib/libspl to linux-libspl branch
2008-12-11 15:38:59 -08:00
49c1b03fbc
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-12-11 14:25:09 -08:00
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -08:00
3f2453fea7
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-12-11 11:25:56 -08:00
Brian Behlendorf