[cobbler/f20: 8/8] Update to 2.6.2 from master

[Orion Poplawski]

commit 7797a4ba95bae508cf6833a7226588e9ad229e67
Merge: 874e5f4 681c8ab
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Jul 17 10:02:06 2014 -0600

    Update to 2.6.2 from master

 .gitignore   |    3 +
 cobbler.spec |  230 ++++++++++++++++++++++++++--------------------------------
 sources      |    2 +-
 3 files changed, 107 insertions(+), 128 deletions(-)
---
diff --cc .gitignore
index 5309a6d,6143121..44cf2be
--- a/.gitignore
+++ b/.gitignore
@@@ -11,4 -11,6 +11,7 @@@ cobbler-2.0.5.tar.g
  /cobbler-2.2.3.tar.gz
  /cobbler-2.4.0.tar.gz
  /cobbler-2.4.3.tar.gz
 +/cobbler-2.4.4.tar.gz
+ /cobbler-2.6.0.tar.gz
+ /cobbler-2.6.1.tar.gz
+ /cobbler-2.6.2.tar.gz
diff --cc cobbler.spec
index 41bf449,f2b734f..9f54aae
--- a/cobbler.spec
+++ b/cobbler.spec
@@@ -296,11 -267,25 +267,16 @@@ sed -i -e "s/SECRET_KEY = ''/SECRET_KE
  %dir %attr(700,apache,root) /var/lib/cobbler/webui_sessions
  %attr(-,apache,apache) /var/www/cobbler_webui_content/
  
+ 
  %changelog
+ * Wed Jul 16 2014 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-1
+ - Update to 2.6.2
+ - Spec cleanup
+ 
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.1-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
 -* Fri May 23 2014 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-1
 -- Update to 2.6.1
 +* Tue Apr 22 2014 Orion Poplawski <orion at cora.nwra.com> - 2.4.4-1
 +- Update to 2.4.4
  - Drop koan patch applied upstream
  
 -* Tue Apr 22 2014 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-2
 -- Only require syslinux on x86
 -
 -* Mon Apr 21 2014 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-1
 -- Update to 2.6.0
 -
  * Mon Apr 21 2014 Orion Poplawski <orion at cora.nwra.com> - 2.4.3-1
  - Update to 2.4.3
  - Add patch to fix bug #1047350