51536ea5f4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:32:58 -07:00
a082023842
Merge commit 'refs/top-bases/feature-branch' into feature-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzpool/include/sys/zfs_context.h
lib/libzpool/kernel.c
lib/libzpool/taskq.c
2010-05-27 13:30:48 -07:00
3bd93e7103
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-05-27 13:25:20 -07:00
099e8e493a
Remove feature-pthreads prior to b141 update.
...
The pthreads change will need to be reworked and reapplied.
This will be easier to do from scratch rather than sort out
the merge.
2010-05-27 13:23:58 -07:00
3e92dd2221
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-23 10:05:04 -07:00
fd6bf51a0a
Use more correct /usr/bin/awk patch for default.
2010-05-23 09:57:05 -07:00
b61fb0770e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-21 16:48:35 -07:00
5da0e30597
Ensure COPYRIGHT file is included in the package.
2010-05-21 16:34:38 -07:00
1d5ebc3210
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-21 15:58:48 -07:00
6c054707ce
Remove TODO file for spec file.
2010-05-21 15:40:24 -07:00
909c60e23f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-21 15:32:27 -07:00
84c7c5fb58
Prep for 0.4.9 tag update META, README, ChangeLog.
...
Updated README to reflect the current state of the project and to
be less developer focused. It now simply includes basic build
instructions for packages and little example of some of the cool
things you can do.
Also remove the out of data TODO file. This sort of thing can
and be tracked on the GitHub issue tracker.
2010-05-21 15:11:49 -07:00
4221c8cf93
Minor spec file cleanup for RHEL6 package dependency.
2010-05-21 15:08:08 -07:00
3a9c2a23b7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-20 10:25:43 -07:00
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
0aa6aae489
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-18 16:23:21 -07:00
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
2162a61b70
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-18 15:12:13 -07:00
4e7fd8ff9d
Move build system and core script changes to correct zfs-branch.
2010-05-18 15:05:44 -07:00
f3d4e7adc5
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-18 15:01:54 -07:00
ccc172b362
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-18 15:01:12 -07:00
e169ec5315
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-18 15:01:11 -07:00
8e65e1c40b
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-05-18 15:01:09 -07:00
00f9eadea4
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-05-18 15:01:09 -07:00
83051bdf63
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-05-18 15:01:09 -07:00
6c4c07e314
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-05-18 15:01:09 -07:00
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
0db2bcbcd5
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-05-18 15:01:07 -07:00
1fa85ba793
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-18 15:01:05 -07:00
eb03ee363a
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-05-18 15:01:03 -07:00
1587b4b366
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-05-18 15:01:03 -07:00
923e1bad7f
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-05-18 15:01:02 -07:00
a050659724
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
2010-05-18 15:01:02 -07:00
56abf9a10f
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-05-18 15:01:01 -07:00
8b7b401717
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-05-18 15:01:00 -07:00
13493e3166
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-05-18 15:01:00 -07:00
3666b263e0
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-05-18 15:00:59 -07:00
4ee7b37f0b
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-05-18 15:00:59 -07:00
fa53553fc1
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-05-18 15:00:58 -07:00
202285d64a
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-05-18 15:00:57 -07:00
46c73e7b7a
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-05-18 15:00:57 -07:00
d476e932ac
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-05-18 15:00:56 -07:00
4903c7d0e9
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-05-18 15:00:55 -07:00
c670bcacc4
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-05-18 15:00:55 -07:00
9a13227b89
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-05-18 15:00:54 -07:00
e3dccb9279
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-05-18 15:00:54 -07:00
77b455afe7
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-05-18 15:00:53 -07:00
f017b5e433
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-05-18 15:00:53 -07:00
2be44c5dd7
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-05-18 15:00:52 -07:00
f24e2bcaf8
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-05-18 15:00:51 -07:00
Brian Behlendorf