]> git.michaelhowe.org Git - packages/o/openafs.git/commit
projects / packages / o / openafs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 867bd2b a75274d)
Merge commit 'upstream/1.4.9.pre2+dfsg1'
authorRuss Allbery <rra@debian.org>
Wed, 1 Apr 2009 01:24:28 +0000 (18:24 -0700)
committerRuss Allbery <rra@debian.org>
Wed, 1 Apr 2009 01:24:28 +0000 (18:24 -0700)
commitac988a5817a1cff7fd5105a049feec9b87643abe
tree266a0d8d8d0e646a8bfc804b3a13ad75d9a7513btree | snapshot
parent867bd2b4884a1a5ded27d8fb32bdbb8ab889c536commit | diff
parenta75274d87435e0a085fa3a48541acc98170f07dfcommit | diff
Merge commit 'upstream/1.4.9.pre2+dfsg1'

Conflicts:
src/afs/LINUX/osi_groups.c
src/afs/LINUX/osi_vfsops.c
src/afs/LINUX/osi_vnodeops.c
src/audit/audit.c
src/auth/userok.c
src/ptserver/ptprocs.c
src/rx/rx.c
src/ubik/recovery.c
src/ubik/remote.c
src/util/get_krbrlm.c
src/viced/host.c
src/viced/viced.c
configure.in diff1 | diff2 | blob | history
src/cf/osconf.m4 diff1 | diff2 | blob | history