summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <behlendorf1@llnl.gov>2009-03-20 14:41:01 -0700
committerBrian Behlendorf <behlendorf1@llnl.gov>2009-03-20 14:41:01 -0700
commit79ec8f2ec45e4f67289969f6ef26a3903669d036 (patch)
tree9e3c4d5cf3c81656d440effcd2d21b35a7938975
parentdabaf9a6e44a4b79689421ab786605e6277f9e2f (diff)
parentecfbcbb3f74de5ed7468c09db190dffc443e5168 (diff)
Merge commit 'refs/top-bases/top' into topzfs-0.4.3
-rw-r--r--ChangeLog4
-rw-r--r--TODO6
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c213b0a0..a9c6e8c0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,7 @@
* : Rebased to ZFS b108 from OpenSolaris
- * configure.ac, *Makefile.am: Build system updatei. This includes
+ * configure.ac, *Makefile.am: Build system update. This includes
resolving various build issues and adding support for the remaining
common build targets. Available targets now include:
@@ -26,7 +26,7 @@
This will produce two binary RPMs with correct 'requires'
dependencies for your kernel. One will contain all zfs modules
and support utilities, the other is a devel package for compiling
- additional kernel modules which are dependant on the zfs.
+ additional kernel modules which are dependent on the zfs.
zfs-x.y.z-1_<kernel version>.x86_64.rpm
zfs-devel-x.y.2-1_<kernel version>.x86_64.rpm
diff --git a/TODO b/TODO
index e16d05da7..495371e12 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,7 @@ SUMMARY OF MAJOR KNOWN PROBLEMS IN v0.4.3 (Development Release)
- Implement something similar to the Solaris devid support to ensure
ZFS properly locates your disks even when moved. The current port
- is dependant on using something like udev to ensure this can never
+ is dependent on using something like udev to ensure this can never
happen but this is not a viable long term solution.
- Implement something like Solaris's sysevent support to detect when
@@ -33,7 +33,7 @@ SUMMARY OF MAJOR KNOWN PROBLEMS IN v0.4.3 (Development Release)
lt-ztest: ../../lib/libzpool/taskq.c:199: Assertion
`pthread_create(&tq->tq_threadlist[t], NULL, taskq_thread, tq) == 0' failed.
-2) Reproducable on my RHEL5-x86_64 box after perhaps an hour:
+2) Reproducible on my RHEL5-x86_64 box after perhaps an hour:
ztest -V -T 18000
5 vdevs, 7 datasets, 23 threads, 18000 seconds...
@@ -44,7 +44,7 @@ SUMMARY OF MAJOR KNOWN PROBLEMS IN v0.4.3 (Development Release)
dsl_dataset_hold_obj(dp, dsobj, ((char *)__func__), &ds) (0x0 == 0x2)' failed.
child died with signal 6
-3) Reproducable on my RHEL5-x86_64 box after perhaps an hour:
+3) Reproducible on my RHEL5-x86_64 box after perhaps an hour:
ztest -V -T 18000
5 vdevs, 7 datasets, 23 threads, 18000 seconds...