9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
9476bd93ca
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-20 09:29:17 -07:00
13814fe220
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-03-20 09:29:16 -07:00
99da5f93e8
Fix uninitialized variable error in ztest_dmu_commit_callbacks()
2009-03-20 09:20:49 -07:00
6d883d7d40
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 21:28:48 -07:00
63781842e3
Update mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks.
2009-03-19 21:21:35 -07:00
64684cadfa
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-03-19 21:19:28 -07:00
fed604c844
Add extra () requested by gcc
2009-03-19 21:18:54 -07:00
f180959bac
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 20:51:18 -07:00
54b5b41a58
Add 'feature-pthreads' branch to features branch.
2009-03-19 20:49:52 -07:00
29703a5b4e
Add 'feature-commit-cb' branch for DMU commit callbacks.
2009-03-19 20:30:14 -07:00
73942e84b1
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-02-18 14:30:49 -08:00
87307ab12a
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-02-18 14:30:48 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
16ef710f59
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-01-26 22:01:15 -08:00
3bac1c60c0
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-26 22:01:15 -08:00
c65e71073f
Refresh type in topgit git://* reference
2009-01-26 21:58:32 -08:00
6425f28bca
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-01-20 15:46:26 -08:00
3c39b49269
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-20 15:46:26 -08:00
4710ede86a
Add GIT to master
2009-01-20 15:43:44 -08:00
a6f5fb35f6
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-01-15 14:16:20 -08:00
27cf20b0d6
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-15 14:16:19 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
7641911aec
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-01-05 12:09:01 -08:00
52bc9eee2b
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-05 12:09:00 -08:00
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
47d6e36480
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-01-05 11:11:54 -08:00
80330daf72
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-05 11:11:54 -08:00
36b849fa51
Remove zdump, it's an unrelateds command which I added simply due to the z* command convention
2009-01-05 11:10:13 -08:00
625fac6664
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 11:34:24 -08:00
63bf9b60d5
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.
2008-12-18 11:31:32 -08:00
e4d1734eb1
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 10:05:59 -08:00
432399da0f
Add dropping written variable declaration
2008-12-18 10:03:57 -08:00
6f3a9cb131
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-12 13:46:56 -08:00
6da8e28ab6
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2008-12-12 13:46:56 -08:00
2ffe84f024
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-12 13:46:55 -08:00
240084a033
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-12 13:46:54 -08:00
810db7e0a2
Remove zcommon reference merged in to zpool
2008-12-12 13:41:20 -08:00
2308a268a5
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-11 15:41:51 -08:00
12389cbaaf
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2008-12-11 15:41:51 -08:00
843ecec587
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 15:41:50 -08:00
a557668285
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 15:41:49 -08:00
6b2c60acca
Moving lib/libspl to linux-libspl branch
2008-12-11 15:38:59 -08:00
f86c85c6a1
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-11 14:25:30 -08:00
a98fdcc1b6
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2008-12-11 14:25:30 -08:00
4bc4fbeb38
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 14:25:29 -08:00
208f59182a
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 14:25:28 -08:00
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -08:00
665fd93e6f
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2008-12-11 11:27:19 -08:00
Brian Behlendorf