Commit Graph

3990 Commits

Author SHA1 Message Date
Brian Behlendorf b974e4bf4d Fix error message to reference the new libuuid package.
It used to be the case that libuuid was part of e2fsprogs.  However,
since other projects unrelated to e2fsprogs make use of that library
it was getting aukward to have that dependency.  The package was
split from e2fsprogs and moved to its own devel package in the
util-linux-ng project.  Anyway, I'm just updating the error message
to reflect the new upstream reality.
2010-05-20 10:00:03 -07:00
Brian Behlendorf 1f47cacf55 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-18 16:22:53 -07:00
Brian Behlendorf d28ada9eaa Remove explicit import from zconfig test 1.
Due to now resolved bug in the SPL you would need to explicitly
import you zpools after module load.  Now that is no longer the case.
If a cache file is found your pool will be automatically loaded and
available so I'm removing the explicit imports from the test case.
2010-05-18 16:15:57 -07:00
Brian Behlendorf b2b2ac77ed Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-18 15:11:43 -07:00
Brian Behlendorf 4e7fd8ff9d Move build system and core script changes to correct zfs-branch. 2010-05-18 15:05:44 -07:00
Brian Behlendorf 17fb5b0abe Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-18 15:01:23 -07:00
Brian Behlendorf ccc172b362 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-18 15:01:12 -07:00
Brian Behlendorf e169ec5315 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-18 15:01:11 -07:00
Brian Behlendorf 8e65e1c40b Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-05-18 15:01:09 -07:00
Brian Behlendorf 00f9eadea4 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-05-18 15:01:09 -07:00
Brian Behlendorf 83051bdf63 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-18 15:01:09 -07:00
Brian Behlendorf 6c4c07e314 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-05-18 15:01:09 -07:00
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 0db2bcbcd5 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-05-18 15:01:07 -07:00
Brian Behlendorf 1fa85ba793 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-18 15:01:05 -07:00
Brian Behlendorf eb03ee363a Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-05-18 15:01:03 -07:00
Brian Behlendorf 1587b4b366 Merge branch 'fix-error-handling' into refs/top-bases/fix-branch 2010-05-18 15:01:03 -07:00
Brian Behlendorf a050659724 Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling 2010-05-18 15:01:02 -07:00
Brian Behlendorf 923e1bad7f Merge branch 'fix-acl' into refs/top-bases/fix-branch 2010-05-18 15:01:02 -07:00
Brian Behlendorf 56abf9a10f Merge commit 'refs/top-bases/fix-acl' into fix-acl 2010-05-18 15:01:01 -07:00
Brian Behlendorf 13493e3166 Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode 2010-05-18 15:01:00 -07:00
Brian Behlendorf 8b7b401717 Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2010-05-18 15:01:00 -07:00
Brian Behlendorf 4ee7b37f0b Merge commit 'refs/top-bases/fix-strncat' into fix-strncat 2010-05-18 15:00:59 -07:00
Brian Behlendorf 3666b263e0 Merge branch 'fix-strncat' into refs/top-bases/fix-branch 2010-05-18 15:00:59 -07:00
Brian Behlendorf fa53553fc1 Merge branch 'fix-list' into refs/top-bases/fix-branch 2010-05-18 15:00:58 -07:00
Brian Behlendorf 46c73e7b7a Merge commit 'refs/top-bases/fix-list' into fix-list 2010-05-18 15:00:57 -07:00
Brian Behlendorf 202285d64a Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-05-18 15:00:57 -07:00
Brian Behlendorf d476e932ac Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2010-05-18 15:00:56 -07:00
Brian Behlendorf c670bcacc4 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2010-05-18 15:00:55 -07:00
Brian Behlendorf 4903c7d0e9 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2010-05-18 15:00:55 -07:00
Brian Behlendorf e3dccb9279 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2010-05-18 15:00:54 -07:00
Brian Behlendorf 9a13227b89 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2010-05-18 15:00:54 -07:00
Brian Behlendorf f017b5e433 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2010-05-18 15:00:53 -07:00
Brian Behlendorf 77b455afe7 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2010-05-18 15:00:53 -07:00
Brian Behlendorf 2be44c5dd7 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2010-05-18 15:00:52 -07:00
Brian Behlendorf 6430461823 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2010-05-18 15:00:51 -07:00
Brian Behlendorf f24e2bcaf8 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2010-05-18 15:00:51 -07:00
Brian Behlendorf 027dccc808 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2010-05-18 15:00:50 -07:00
Brian Behlendorf bca9497a1c Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2010-05-18 15:00:49 -07:00
Brian Behlendorf b29650b928 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2010-05-18 15:00:49 -07:00
Brian Behlendorf 238324940d Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2010-05-18 15:00:48 -07:00
Brian Behlendorf 1a23010b0f Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2010-05-18 15:00:48 -07:00
Brian Behlendorf 42f4fe5178 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2010-05-18 15:00:47 -07:00
Brian Behlendorf 083ebb73e6 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2010-05-18 15:00:47 -07:00
Brian Behlendorf c0a13a0870 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2010-05-18 15:00:46 -07:00
Brian Behlendorf 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
Brian Behlendorf 349ffff391 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-05-18 15:00:45 -07:00
Brian Behlendorf 1e8fbfb2e6 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2010-05-18 15:00:44 -07:00
Brian Behlendorf 72b281a2f4 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-05-18 15:00:39 -07:00
Brian Behlendorf 9b305f092f Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-05-18 15:00:39 -07:00