Whamcloud - gitweb
merge from b_devel -> b_ad
authorrread <rread>
Thu, 5 Jun 2003 04:12:30 +0000 (04:12 +0000)
committerrread <rread>
Thu, 5 Jun 2003 04:12:30 +0000 (04:12 +0000)
commit40b1c9919699c81bc45b916079365197fe948dc6
tree6496f59e8ee9dbfa488675a927b96ce0f720ceeb
parent4786008cb5894f0cdfb77071a921cc6769dddc27
merge from b_devel -> b_ad
  DEVEL_AD_PARENT_20030526 -> DEVEL_AD_PARENT_20030605

Large, squirrelly merge. It mounts, and acceptance_small.sh finishes
the test and then fails in cleanup, just like b_devel.
lustre/ldlm/ldlm_lib.c