[condor/f19: 9/9] Merge branch 'f18' into f19

[tstclair]

commit ef9e34cf3497115641d72d09235c6534ffdbf654
Merge: 1a12a42 89fec12
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Mon Jul 15 10:46:45 2013 -0500

    Merge branch 'f18' into f19
    
    Conflicts:
    	condor.spec

 .gitignore                  |    3 +
 aviaryfields.patch          |   24 +
 cgahp_scaling.patch         |  140 ----
 condor-1605-v4.patch        | 1464 -------------------------------------------
 condor-tmpfiles.conf        |    1 +
 condor.service              |    2 +-
 condor.spec                 |   88 +--
 condor_config.generic.patch |  259 --------
 condor_host_alias_patch.txt |  386 ------------
 sources                     |    2 +-
 wso2-axis2.patch            |   11 -
 zkm-782.patch               |   96 ---
 12 files changed, 60 insertions(+), 2416 deletions(-)
---
diff --cc condor.spec
index 56f3529,e07103c..e5bca97
--- a/condor.spec
+++ b/condor.spec
@@@ -1239,9 -1205,12 +1205,15 @@@ f
  %endif
  
  %changelog
+ * Sat Jun 22 2013 <tstclair at redhat.com> - 8.1.0-0.2
+ - Fix for aviary hadoop field swap
+ 
+ * Wed Jun 19 2013 <tstclair at redhat.com> - 8.1.0-0.1
+ - Update to latest uw/master
+ 
 +* Fri Jun 14 2013 Peter Robinson <pbrobinson at fedoraproject.org> 7.9.5-0.3
 +- build plumage for ARM as it has mongodb
 +
  * Fri Mar 15 2013 <tstclair at redhat.com> - 7.9.5-0.2
  - Update build dependencies