[condor: 8/8] Merge branch 'f16'

[tstclair]

commit 1827764bf7ee37cb29254d2cded84a2e8384a23b
Merge: 044d297 ae44ff2
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Fri Sep 30 13:28:01 2011 -0500

    Merge branch 'f16'
    
    Conflicts:
    	condor.spec

 .gitignore           |    5 -
 7.7.0-catch-up.patch |122246 --------------------------------------------------
 cmake_26.patch       |   13 -
 condor.spec          |  300 +-
 sources              |    2 +-
 5 files changed, 101 insertions(+), 122465 deletions(-)
---
diff --cc condor.spec
index 3873bf6,802eaa8..d4c992a
--- a/condor.spec
+++ b/condor.spec
@@@ -1031,9 -927,10 +927,13 @@@ f
  %endif
  
  %changelog
+ * Fri Sep 16 2011 <tstclair at redhat.com> - 7.7.1-0.1
+ - Fast forward to 7.7.1 official release tag V7_7_1
+ - ghost var/lock and var/run in spec (BZ656562)
+ 
 +* Tue Aug  10 2011 <tstclair at redhat.com> - 7.7.0-0.6
 +- Rebuild deltacloud dep
 +
  * Tue Jun  8 2011 <bbockelm at cse.unl.edu> - 7.7.0-0.5
  - Start to break build products into conditionals for future EPEL5 support.
  - Begun integration of a systemd service file.