OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-1125-ge9ac2cd

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit e9ac2cdf0125b802f4de4fffa1863a5b557dc807
Author: Marc Dionne <marc.c.dionne@gmail.com>
Date:   Fri Apr 22 22:23:21 2011 -0400

    ubik: add uvote_HaveSyncAndVersion
    
    Add a new function uvote_HaveSyncAndVersion() that combines the
    logic from uvote_GetSyncSite and uvote_eq_dbVersion, without
    releasing the vote lock in between.  Make use of it in
    urecovery_AllBetter.
    
    Change-Id: Ia44337da0f4335bd312cd686904f633ac19f1b63
    Reviewed-on: http://gerrit.openafs.org/4526
    Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/ubik/recovery.c |    2 +-
 src/ubik/ubik.p.h   |    1 +
 src/ubik/vote.c     |   24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletions(-)

-- 
OpenAFS Master Repository