ff96dfaacf
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-05-18 15:00:25 -07:00
6119cb885a
Add AUTHORS to master branch
2010-05-18 14:55:01 -07:00
c8da3bb68b
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-05-18 14:32:54 -07:00
fa94cf43b9
Update COPYRIGHT to reference zpios CDDL exceptions.
2010-05-18 14:25:28 -07:00
bf37c82d6b
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-05-18 11:13:18 -07:00
94d52d93d9
Update COPYRIGHT to include release id LLNL-CODE-403049.
2010-05-18 11:06:56 -07:00
13a3534f0f
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-05-18 10:38:32 -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
6edb312559
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 12:03:45 -07:00
3affbe6d7e
Update nvpair's to include nv_alloc_fixed support
2010-04-29 11:59:41 -07:00
a3c2fb2333
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 10:41:02 -07:00
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
cf4d8c2bbf
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-03-11 09:54:55 -08:00
414f1f975e
Rename update-zfs.sh -> zfs-update.sh for consistency
2010-03-11 09:53:59 -08:00
dcd0eecf89
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-03-09 14:19:20 -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
cdbe3032eb
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-01-08 11:39:09 -08:00
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
373284ec9a
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-12-11 16:21:36 -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
b5e7e8a1de
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-11-15 16:26:17 -08:00
0aa61e8427
Remove zvol.c when updating in update-zfs.sh Linux version available.
2009-11-15 16:20:01 -08:00
bbdc4a3fcc
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-10-09 15:42:42 -07:00
5c36312909
Script update-zfs.sh updated to include libefi library
2009-10-09 15:37:29 -07:00
08f5b3c23d
Required build 121 updates for gcc-shadow
2009-08-18 14:09:15 -07:00
db89339134
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-08-18 12:07:23 -07:00
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
cfd9e9936f
Fix an accidentally introduced formatting issue in zfs output.
...
Because the local 'index' variable shadows the index() function
it was replaced by 'i'. Unfortunately when I made this change
I accidentally replaced one instance with 'j' resulting in the
short decimal values being printed incorrectly.
2009-07-31 13:50:21 -07:00
244d656e28
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-07-02 16:59:39 -07:00
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
3eb7fa9afd
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-02-18 14:04:08 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
7491e3125a
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-26 22:00:51 -08:00
c65e71073f
Refresh type in topgit git://* reference
2009-01-26 21:58:32 -08:00
aff9866d5f
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-20 15:46:03 -08:00
4710ede86a
Add GIT to master
2009-01-20 15:43:44 -08:00
7b54fe44dc
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-15 14:05:38 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
600c6efdab
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-05 12:08:07 -08:00
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
5db7d5eb99
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-05 11:11:31 -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
6cccf01d35
Missed needed drc var
2008-12-18 13:50:12 -08:00
973a9d5a79
Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway
2008-12-18 13:41:21 -08:00
163f096cb6
Resolve remove shadow, rename to rm
2008-12-18 13:24:37 -08:00
d957a6c66f
Resolve dnp shadow conflict
2008-12-18 11:49:22 -08:00
50b70a0c9a
Resolve time conflict
2008-12-18 11:22:39 -08:00
c37308fc20
Resolve stat conflict with stat()
2008-12-18 09:03:02 -08:00
194244b80b
Resolve read shadow conflict
2008-12-17 16:57:21 -08:00
1e3aeaaef1
Resolve shadow conflict
2008-12-17 13:08:39 -08:00
Brian Behlendorf