Brian Behlendorf
e4d0d5c10c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 20:06:10 -07:00
Brian Behlendorf
9644f95585
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-27 20:06:10 -07:00
Brian Behlendorf
be3f503d82
Remove fix-clock-wrap dependency from fix-branch
2010-05-27 19:59:32 -07:00
Brian Behlendorf
a9ea79346f
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 17:04:45 -07:00
Brian Behlendorf
2fbe461b55
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 17:02:15 -07:00
Brian Behlendorf
a7dcb2247a
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-27 17:02:14 -07:00
Brian Behlendorf
03fdccb846
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-05-27 17:02:14 -07:00
Brian Behlendorf
146ded4db2
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-05-27 17:02:13 -07:00
Brian Behlendorf
db069704ed
Revert fix-clock-wrap fixed upstream
...
This was more or less fixed upstream. Instead of directly accessing
lbolt they now use ddi_get_lbolt() which we can have do the right
thing is the SPL so we don't need to carry this patch.
2010-05-27 16:54:23 -07:00
Brian Behlendorf
05a2a919c8
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 16:43:05 -07:00
Brian Behlendorf
dcf4bc1e52
Re-remove feature-branch dependency.
2010-05-27 16:34:02 -07:00
Brian Behlendorf
44fdc3f023
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 16:23:57 -07:00
Brian Behlendorf
ea431b4dc6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 16:14:04 -07:00
Brian Behlendorf
319f69734b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-05-27 16:13:19 -07:00
Brian Behlendorf
390995db28
Revert all remaining changes.
2010-05-27 14:25:06 -07:00
Brian Behlendorf
63fce783d6
Readd feature-branch to get the last of the reversions
2010-05-27 14:23:51 -07:00
Brian Behlendorf
73154ba3a6
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 14:20:57 -07:00
Brian Behlendorf
0e46276339
Remove feature-branch.
...
All but the pthreads changes have been committed upstream and in
the name of keeping the topgit tree as simple as possible I'm removing
the entire 'feature' subtree. The pthreads changes are now a 'fix'.
2010-05-27 14:17:51 -07:00
Brian Behlendorf
94ec502e69
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 14:15:45 -07:00
Brian Behlendorf
b265da19f0
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 14:15:08 -07:00
Brian Behlendorf
3a7896c8d2
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 14:15:08 -07:00
Brian Behlendorf
c7742fd698
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-05-27 14:15:07 -07:00
Brian Behlendorf
5c16b9898b
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-05-27 14:15:07 -07:00
Brian Behlendorf
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
Brian Behlendorf
621bdaee6e
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 13:57:54 -07:00
Brian Behlendorf
249ae381e1
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 13:57:16 -07:00
Brian Behlendorf
59104b4325
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:57:16 -07:00
Brian Behlendorf
262c747b4c
Remove feature-pthreads topic branch
2010-05-27 13:54:07 -07:00
Brian Behlendorf
9e8bb2aae4
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 13:53:15 -07:00
Brian Behlendorf
d8e5eb56b8
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 13:42:00 -07:00
Brian Behlendorf
028e42b692
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:42:00 -07:00
Brian Behlendorf
cde6e6fec8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-05-27 13:40:15 -07:00
Brian Behlendorf
1dc4235011
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-05-27 13:40:14 -07:00
Brian Behlendorf
ca50214549
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-05-27 13:40:14 -07:00
Brian Behlendorf
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
Brian Behlendorf
9ea3febcbd
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 13:37:43 -07:00
Brian Behlendorf
c17d3e05eb
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 13:32:58 -07:00
Brian Behlendorf
51536ea5f4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:32:58 -07:00
Brian Behlendorf
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
Brian Behlendorf
3bd93e7103
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-05-27 13:25:20 -07:00
Brian Behlendorf
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
Brian Behlendorf
9a4fcd301a
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-23 10:06:59 -07:00
Brian Behlendorf
fd6bf51a0a
Use more correct /usr/bin/awk patch for default.
2010-05-23 09:57:05 -07:00
Brian Behlendorf
404ddb3a37
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-21 16:49:50 -07:00
Brian Behlendorf
5da0e30597
Ensure COPYRIGHT file is included in the package.
2010-05-21 16:34:38 -07:00
Brian Behlendorf
84329e8f52
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-21 16:03:24 -07:00
Brian Behlendorf
6c054707ce
Remove TODO file for spec file.
2010-05-21 15:40:24 -07:00
Brian Behlendorf
a8438870bb
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-21 15:37:05 -07:00
Brian Behlendorf
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
Brian Behlendorf
4221c8cf93
Minor spec file cleanup for RHEL6 package dependency.
2010-05-21 15:08:08 -07:00