]> granicus.if.org Git - zfs/log
zfs
15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Mon, 6 Jul 2009 22:38:49 +0000 (15:38 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Mon, 6 Jul 2009 22:38:48 +0000 (15:38 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoAdditional lock calls were added to ztest and they must be updated
Brian Behlendorf [Mon, 6 Jul 2009 22:31:54 +0000 (15:31 -0700)]
Additional lock calls were added to ztest and they must be updated
to use the pthread's API in favour of Solaris threads.

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Mon, 6 Jul 2009 20:16:34 +0000 (13:16 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Mon, 6 Jul 2009 20:16:32 +0000 (13:16 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoMerge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Mon, 6 Jul 2009 20:16:29 +0000 (13:16 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads

Conflicts:

cmd/ztest/ztest.c

15 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Mon, 6 Jul 2009 20:15:43 +0000 (13:15 -0700)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

15 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Mon, 6 Jul 2009 20:15:35 +0000 (13:15 -0700)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Conflicts:

cmd/ztest/ztest.c

15 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Mon, 6 Jul 2009 20:14:41 +0000 (13:14 -0700)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

15 years agoRebase master to b117
Brian Behlendorf [Thu, 2 Jul 2009 22:44:48 +0000 (15:44 -0700)]
Rebase master to b117

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Fri, 20 Mar 2009 16:29:17 +0000 (09:29 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Fri, 20 Mar 2009 16:29:17 +0000 (09:29 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoMerge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Fri, 20 Mar 2009 16:29:16 +0000 (09:29 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads

15 years agoFix uninitialized variable error in ztest_dmu_commit_callbacks()
Brian Behlendorf [Fri, 20 Mar 2009 16:20:49 +0000 (09:20 -0700)]
Fix uninitialized variable error in ztest_dmu_commit_callbacks()

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Fri, 20 Mar 2009 04:28:48 +0000 (21:28 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Fri, 20 Mar 2009 04:28:48 +0000 (21:28 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoUpdate mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks.
Brian Behlendorf [Fri, 20 Mar 2009 04:21:35 +0000 (21:21 -0700)]
Update mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks.

15 years agoMerge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Fri, 20 Mar 2009 04:19:28 +0000 (21:19 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads

15 years agoAdd extra () requested by gcc
Brian Behlendorf [Fri, 20 Mar 2009 04:18:54 +0000 (21:18 -0700)]
Add extra () requested by gcc

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Fri, 20 Mar 2009 03:51:18 +0000 (20:51 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Fri, 20 Mar 2009 03:51:18 +0000 (20:51 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoNew TopGit dependency: feature-pthreads
Brian Behlendorf [Fri, 20 Mar 2009 03:51:17 +0000 (20:51 -0700)]
New TopGit dependency: feature-pthreads

15 years agoAdd 'feature-pthreads' branch to features branch.
Brian Behlendorf [Fri, 20 Mar 2009 03:49:52 +0000 (20:49 -0700)]
Add 'feature-pthreads' branch to features branch.

15 years agoAdd 'feature-commit-cb' branch for DMU commit callbacks.
Brian Behlendorf [Fri, 20 Mar 2009 03:30:14 +0000 (20:30 -0700)]
Add 'feature-commit-cb' branch for DMU commit callbacks.

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:30:50 +0000 (14:30 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:30:49 +0000 (14:30 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Wed, 18 Feb 2009 22:30:48 +0000 (14:30 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoRebase master to b108
Brian Behlendorf [Wed, 18 Feb 2009 20:51:31 +0000 (12:51 -0800)]
Rebase master to b108

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:15 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:15 +0000 (22:01 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Tue, 27 Jan 2009 06:01:15 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoRefresh type in topgit git://* reference
Brian Behlendorf [Tue, 27 Jan 2009 05:58:32 +0000 (21:58 -0800)]
Refresh type in topgit git://* reference

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:27 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:26 +0000 (15:46 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Tue, 20 Jan 2009 23:46:26 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoAdd GIT to master
Brian Behlendorf [Tue, 20 Jan 2009 23:43:44 +0000 (15:43 -0800)]
Add GIT to master

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 15 Jan 2009 22:16:21 +0000 (14:16 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 15 Jan 2009 22:16:20 +0000 (14:16 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Thu, 15 Jan 2009 22:16:19 +0000 (14:16 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoRebase master to b105
Brian Behlendorf [Thu, 15 Jan 2009 21:59:39 +0000 (13:59 -0800)]
Rebase master to b105

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Mon, 5 Jan 2009 20:09:03 +0000 (12:09 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Mon, 5 Jan 2009 20:09:01 +0000 (12:09 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Mon, 5 Jan 2009 20:09:00 +0000 (12:09 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoAdd unicode library
Brian Behlendorf [Mon, 5 Jan 2009 20:03:23 +0000 (12:03 -0800)]
Add unicode library

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Mon, 5 Jan 2009 19:11:55 +0000 (11:11 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Mon, 5 Jan 2009 19:11:54 +0000 (11:11 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Mon, 5 Jan 2009 19:11:54 +0000 (11:11 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoRemove zdump, it's an unrelateds command which I added simply due to the z* command...
Brian Behlendorf [Mon, 5 Jan 2009 19:10:13 +0000 (11:10 -0800)]
Remove zdump, it's an unrelateds command which I added simply due to the z* command convention

16 years agoResolve time conflict
Brian Behlendorf [Thu, 18 Dec 2008 19:41:30 +0000 (11:41 -0800)]
Resolve time conflict

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 18 Dec 2008 19:34:24 +0000 (11:34 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 18 Dec 2008 19:34:24 +0000 (11:34 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoRevert changes from this branch so the branch may be removed. We
Brian Behlendorf [Thu, 18 Dec 2008 19:31:32 +0000 (11:31 -0800)]
Revert changes from this branch so the branch may be removed.  We
will integrate the latest patch from Sun here once everything is
is basically working.  This verion of the patch is out of date
anyone and may not be what is needed.

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 18 Dec 2008 18:06:00 +0000 (10:06 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 18 Dec 2008 18:05:59 +0000 (10:05 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoAdd dropping written variable declaration
Brian Behlendorf [Thu, 18 Dec 2008 18:03:57 +0000 (10:03 -0800)]
Add dropping written variable declaration

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Fri, 12 Dec 2008 21:46:56 +0000 (13:46 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Fri, 12 Dec 2008 21:46:56 +0000 (13:46 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Fri, 12 Dec 2008 21:46:56 +0000 (13:46 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Fri, 12 Dec 2008 21:46:55 +0000 (13:46 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Fri, 12 Dec 2008 21:46:54 +0000 (13:46 -0800)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

16 years agoRemove zcommon reference merged in to zpool
Brian Behlendorf [Fri, 12 Dec 2008 21:41:20 +0000 (13:41 -0800)]
Remove zcommon reference merged in to zpool

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Thu, 11 Dec 2008 23:41:51 +0000 (15:41 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 23:41:51 +0000 (15:41 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 23:41:51 +0000 (15:41 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 23:41:50 +0000 (15:41 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Thu, 11 Dec 2008 23:41:49 +0000 (15:41 -0800)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

16 years agoMoving lib/libspl to linux-libspl branch
Brian Behlendorf [Thu, 11 Dec 2008 23:38:59 +0000 (15:38 -0800)]
Moving lib/libspl to linux-libspl branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Thu, 11 Dec 2008 22:25:30 +0000 (14:25 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 22:25:30 +0000 (14:25 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 22:25:30 +0000 (14:25 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 22:25:29 +0000 (14:25 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Thu, 11 Dec 2008 22:25:28 +0000 (14:25 -0800)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

16 years agoScript updates
Brian Behlendorf [Thu, 11 Dec 2008 22:21:14 +0000 (14:21 -0800)]
Script updates

16 years agoMove library files to lib
Brian Behlendorf [Thu, 11 Dec 2008 22:16:55 +0000 (14:16 -0800)]
Move library files to lib

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 19:27:21 +0000 (11:27 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 19:27:19 +0000 (11:27 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Thu, 11 Dec 2008 19:27:18 +0000 (11:27 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 19:27:12 +0000 (11:27 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Thu, 11 Dec 2008 19:27:10 +0000 (11:27 -0800)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

16 years agoFix libspl move to the wrong place
Brian Behlendorf [Thu, 11 Dec 2008 19:22:02 +0000 (11:22 -0800)]
Fix libspl move to the wrong place

16 years agoFix typo
Brian Behlendorf [Thu, 11 Dec 2008 19:16:38 +0000 (11:16 -0800)]
Fix typo

16 years agoAdd a few missing files
Brian Behlendorf [Thu, 11 Dec 2008 19:14:49 +0000 (11:14 -0800)]
Add a few missing files

16 years agoMove the world out of /zfs/ and seperate out module build tree
Brian Behlendorf [Thu, 11 Dec 2008 19:08:09 +0000 (11:08 -0800)]
Move the world out of /zfs/ and seperate out module build tree

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Wed, 10 Dec 2008 20:46:14 +0000 (12:46 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Wed, 10 Dec 2008 20:46:13 +0000 (12:46 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Wed, 10 Dec 2008 20:46:13 +0000 (12:46 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Wed, 10 Dec 2008 20:46:10 +0000 (12:46 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Wed, 10 Dec 2008 20:46:09 +0000 (12:46 -0800)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

16 years agoRemove libumem, we will try and remove this dependency entirely. If we can't then...
Brian Behlendorf [Wed, 10 Dec 2008 20:43:20 +0000 (12:43 -0800)]
Remove libumem, we will try and remove this dependency entirely.  If we can't then the best move will simply be to use the official library, or build it as a convenience library

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 9 Dec 2008 22:16:38 +0000 (14:16 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 9 Dec 2008 22:16:38 +0000 (14:16 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Tue, 9 Dec 2008 22:16:37 +0000 (14:16 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Tue, 9 Dec 2008 22:16:36 +0000 (14:16 -0800)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 9 Dec 2008 22:16:36 +0000 (14:16 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoMove vmem* to libumem
Brian Behlendorf [Tue, 9 Dec 2008 22:14:00 +0000 (14:14 -0800)]
Move vmem* to libumem

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 9 Dec 2008 21:41:01 +0000 (13:41 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Tue, 9 Dec 2008 21:41:00 +0000 (13:41 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 9 Dec 2008 21:41:00 +0000 (13:41 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Tue, 9 Dec 2008 21:40:59 +0000 (13:40 -0800)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 9 Dec 2008 21:40:59 +0000 (13:40 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch