Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-07-09 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-07-09 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'gcc-unused' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-07-09 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Revert to original debugging code and wrap any variabled used only | Brian Behlendorf | 2009-07-09 | 1 | -1/+1 |
* | | | | Untracked pthread changes which must have accidentally crept in. | Brian Behlendorf | 2009-07-08 | 1 | -3/+3 |
* | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-07-08 | 1 | -61/+62 |
|\| | | | |||||
| * | | | Merge branch 'feature-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-07-08 | 1 | -61/+62 |
| |\ \ \ | |||||
| | * \ \ | Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads | Brian Behlendorf | 2009-07-08 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | | * | | | Add new DMU_READ_PREFETCH flag to dmu_read(). | Brian Behlendorf | 2009-07-08 | 1 | -2/+2 |
| | * | | | | Stop the kthread/thread/pthread mixing and matching insanity. Update all | Brian Behlendorf | 2009-07-08 | 1 | -59/+60 |
* | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-07-08 | 2 | -12/+24 |
|\| | | | | | |||||
| * | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-07-08 | 2 | -12/+24 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge branch 'gcc-cast' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-07-08 | 2 | -11/+21 |
| | |\ \ \ \ | |||||
| | | * | | | | Add explicit casts for (u_longlong_t) when printing uint64_t. | Brian Behlendorf | 2009-07-08 | 1 | -10/+20 |
| | | * | | | | Add explicit casts for (u_longlong_t) when printing uint64_t. | Brian Behlendorf | 2009-07-08 | 1 | -1/+1 |
| | | * | | | | Merge commit 'refs/top-bases/gcc-cast' into gcc-cast | Brian Behlendorf | 2009-07-02 | 8 | -747/+1331 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | * | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-07-08 | 1 | -1/+3 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Resolve a 2 new cases of for loop variable declared in for() | Brian Behlendorf | 2009-07-08 | 1 | -1/+3 |
* | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-07-06 | 1 | -9/+9 |
|\| | | | | | | | |||||
| * | | | | | | | Merge branch 'feature-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-07-06 | 1 | -9/+9 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | Additional lock calls were added to ztest and they must be updated | Brian Behlendorf | 2009-07-06 | 1 | -9/+9 |
| | * | | | | | | Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads | Brian Behlendorf | 2009-07-06 | 8 | -748/+1333 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb | Brian Behlendorf | 2009-07-06 | 8 | -746/+1331 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
* | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-07-06 | 8 | -749/+1333 |
|\| | | | | | | | |||||
| * | | | | | | | Merge branch 'feature-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-07-06 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch | Brian Behlendorf | 2009-07-06 | 8 | -748/+1333 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | / / / / | | | | |/ / / / | | | |/| | | | | |||||
| * | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-07-06 | 8 | -748/+1332 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | * | | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-07-02 | 8 | -747/+1331 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | * | | | | | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 | Brian Behlendorf | 2009-07-02 | 8 | -746/+1331 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | * | | | | Rebase master to b117 | Brian Behlendorf | 2009-07-02 | 8 | -746/+1331 |
* | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-05-22 | 1 | -2/+2 |
|\| | | | | | | | |||||
| * | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-05-22 | 1 | -2/+2 |
| |\| | | | | | | |||||
| | * | | | | | | Merge branch 'gcc-cast' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-05-22 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | Explictly use signed char for portability. On x86/x86_64 | Brian Behlendorf | 2009-05-22 | 1 | -2/+2 |
| | | * | | | | | Merge commit 'refs/top-bases/gcc-cast' into gcc-cast | Brian Behlendorf | 2009-02-18 | 2 | -5/+9 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | * | | | | | Merge commit 'refs/top-bases/gcc-cast' into gcc-cast | Brian Behlendorf | 2009-01-15 | 4 | -123/+171 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge commit 'refs/top-bases/gcc-cast' into gcc-cast | Brian Behlendorf | 2009-01-05 | 1 | -664/+0 |
| | | |\ \ \ \ \ \ | |||||
* | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-03-20 | 1 | -1/+1 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'feature-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-03-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads | Brian Behlendorf | 2009-03-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | * | | | | | | | Fix uninitialized variable error in ztest_dmu_commit_callbacks() | Brian Behlendorf | 2009-03-20 | 1 | -1/+1 |
* | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-03-19 | 1 | -4/+4 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'feature-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-03-19 | 1 | -4/+4 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Update mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks. | Brian Behlendorf | 2009-03-19 | 1 | -4/+4 |
* | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-03-19 | 3 | -59/+280 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'feature-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-03-19 | 3 | -59/+280 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Add 'feature-pthreads' branch to features branch. | Brian Behlendorf | 2009-03-19 | 3 | -67/+65 |
| | |/ / / / / / / | |||||
| | * | | | | / / | Add 'feature-commit-cb' branch for DMU commit callbacks. | Brian Behlendorf | 2009-03-19 | 1 | -0/+223 |
| | | |_|_|_|/ / | | |/| | | | | | |||||
* | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-03-19 | 3 | -59/+59 |
|\| | | | | | | | |||||
| * | | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-03-19 | 3 | -59/+59 |
| |\ \ \ \ \ \ \ |