OpenAFS Master Repository branch, master, updated. openafs-devel-1_5_76-2590-g3e0eaec

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 3770ffe41689bc5b37795f23b0d4f3de4bc0619a
Author: Derrick Brashear <shadow@dementix.org>
Date:   Mon Jun 11 16:05:10 2012 -0400

    viced: fix merge error
    
    when 37fc2dfbb9e3a8a8ecb022febae7ccd04d7340a4 was merged, the close
    bracket went in the wrong place, meaning for non-remote calls
    we don't re-enable keepalives. fix it.
    
    Change-Id: I163db9b3b2f42f629d8a5ff22a75902a61a3138b
    Reviewed-on: http://gerrit.openafs.org/7548
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
    Reviewed-by: Simon Wilkinson <simonxwilkinson@gmail.com>
    Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com>
    Reviewed-by: Derrick Brashear <shadow@dementix.org>

 src/viced/afsfileprocs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-- 
OpenAFS Master Repository