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
6119cb885a
Add AUTHORS to master branch
2010-05-18 14:55:01 -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
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
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
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
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
18f485a504
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-04-29 10:41:52 -07:00
Brian Behlendorf
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
Brian Behlendorf
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
Brian Behlendorf
414f1f975e
Rename update-zfs.sh -> zfs-update.sh for consistency
2010-03-11 09:53:59 -08:00
Brian Behlendorf
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
Brian Behlendorf
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
Brian Behlendorf
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
Brian Behlendorf
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
Brian Behlendorf
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
Brian Behlendorf
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
Brian Behlendorf
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
Brian Behlendorf
0aa61e8427
Remove zvol.c when updating in update-zfs.sh Linux version available.
2009-11-15 16:20:01 -08:00
Brian Behlendorf
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
Brian Behlendorf
5c36312909
Script update-zfs.sh updated to include libefi library
2009-10-09 15:37:29 -07:00
Brian Behlendorf
4f6bbcd0e7
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-08-18 12:10:36 -07:00
Brian Behlendorf
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
Brian Behlendorf
d369760713
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-07-06 13:14:41 -07:00
Brian Behlendorf
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
Brian Behlendorf
87307ab12a
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-02-18 14:30:48 -08:00
Brian Behlendorf
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
Brian Behlendorf
3bac1c60c0
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-26 22:01:15 -08:00
Brian Behlendorf
c65e71073f
Refresh type in topgit git://* reference
2009-01-26 21:58:32 -08:00
Brian Behlendorf
3c39b49269
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-20 15:46:26 -08:00
Brian Behlendorf
4710ede86a
Add GIT to master
2009-01-20 15:43:44 -08:00
Brian Behlendorf
27cf20b0d6
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-15 14:16:19 -08:00
Brian Behlendorf
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
Brian Behlendorf
52bc9eee2b
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-05 12:09:00 -08:00
Brian Behlendorf
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
Brian Behlendorf
80330daf72
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-05 11:11:54 -08:00
Brian Behlendorf
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
Brian Behlendorf
6f3a9cb131
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-12 13:46:56 -08:00
Brian Behlendorf
810db7e0a2
Remove zcommon reference merged in to zpool
2008-12-12 13:41:20 -08:00
Brian Behlendorf
2308a268a5
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-11 15:41:51 -08:00
Brian Behlendorf
6b2c60acca
Moving lib/libspl to linux-libspl branch
2008-12-11 15:38:59 -08:00
Brian Behlendorf
f86c85c6a1
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-11 14:25:30 -08:00
Brian Behlendorf
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
Brian Behlendorf
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -08:00
Brian Behlendorf
e1694cfaec
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-11 11:27:18 -08:00
Brian Behlendorf
b453b61272
Fix libspl move to the wrong place
2008-12-11 11:22:02 -08:00
Brian Behlendorf
4b7ee081ce
Fix typo
2008-12-11 11:16:38 -08:00