ae4b1b469c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-27 14:15:42 -07:00
3a7896c8d2
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 14:15:08 -07:00
b265da19f0
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 14:15:08 -07:00
c7742fd698
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-05-27 14:15:07 -07:00
5c16b9898b
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-05-27 14:15:07 -07:00
b754295dec
Revert feature-zap-cursor-to-key feature upstream
...
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 14:12:59 -07:00
2a6cd5602b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-27 13:57:51 -07:00
59104b4325
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:57:16 -07:00
249ae381e1
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 13:57:16 -07:00
262c747b4c
Remove feature-pthreads topic branch
2010-05-27 13:54:07 -07:00
0ee82dae98
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/dmu_tx.c
2010-05-27 13:53:07 -07:00
028e42b692
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:42:00 -07:00
d8e5eb56b8
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 13:42:00 -07:00
cde6e6fec8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-05-27 13:40:15 -07:00
1dc4235011
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-05-27 13:40:14 -07:00
ca50214549
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-05-27 13:40:14 -07:00
1e32b3c781
Revert feature-commit-cb feature upstream
...
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 13:39:17 -07:00
1ed7d4dcff
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-27 13:37:40 -07:00
51536ea5f4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:32:58 -07:00
c17d3e05eb
Merge branch 'feature-branch' into refs/top-bases/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
c44e622925
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-23 10:06:48 -07:00
fd6bf51a0a
Use more correct /usr/bin/awk patch for default.
2010-05-23 09:57:05 -07:00
6b1c4cab5c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-21 16:49:43 -07:00
5da0e30597
Ensure COPYRIGHT file is included in the package.
2010-05-21 16:34:38 -07:00
f0c0fc4254
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-21 16:02:58 -07:00
6c054707ce
Remove TODO file for spec file.
2010-05-21 15:40:24 -07:00
ecebeeb7e5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-21 15:36:38 -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
a876892309
Revert user space changes from linux-kernel-module topic branch.
...
These changes do not belong on linux-kernel-module since they
are tweaks to user space utilities. I'm reverting them from
this topic branch and will be moving them to a new topic branch
which can be used for just this sort of thing.
2010-05-21 10:40:09 -07:00
6a740514a9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-20 10:29:49 -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
f02ff65e3f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-18 16:24:53 -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
f52c20273b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-18 15:13:48 -07:00
4e7fd8ff9d
Move build system and core script changes to correct zfs-branch.
2010-05-18 15:05:44 -07:00
ca90681bc8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-18 15:03:28 -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
Brian Behlendorf