[nsd/el6: 3/3] Merge branch 'el6' of ssh://pkgs.fedoraproject.org/nsd into el6

[Paul Wouters]

commit dacf5a7c82c0cb5927bc459051b5c148c012584a
Merge: fe59c8e b44d648
Author: Paul Wouters <Paul.Wouters at interisle.net>
Date:   Mon Feb 4 12:47:53 2013 -0500

    Merge branch 'el6' of ssh://pkgs.fedoraproject.org/nsd into el6
    
    Conflicts:
    	nsd.init
    	nsd.spec

 nsd.spec |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --cc nsd.spec
index e1a390b,7081a2d..59bc43c
--- a/nsd.spec
+++ b/nsd.spec
@@@ -101,13 -101,14 +101,14 @@@ if [ "$1" -ge "1" ]; the
  fi
  
  %changelog
 -* Fri Feb 01 2013 Paul Wouters <pwouters at redhat.com> - 3.2.15-1
 -- Updates to 3.2.15 which contains rate limit code
 -- Fix to nsd.init script to return non-zero on service status
 -  when not running (broke puppet)
 +* Mon Feb 04 2013 Paul Wouters <pwouters at redhat.com> - 3.2.15-1
 +- Updated to 3.2.15 which has support for rate limiting
 +- Only run nsdc rebuild hourly cronjob when nsd service is running
 +- Fix nsd.init to return proper return code for 'status' cmd
  
- * Fri Nov 23 2012 Paul Wouters <pwouters at redhat.com> - 3.2.14-1
+ * Fri Nov 23 2012 Paul Wouters <pwouters at redhat.com> - 3.2.14-2
  - Updated to 32.14 with minor bugfixes and TCP writev support
+ - Only run nsdc rebuild hourly cronjob when nsd service is running
  
  * Fri Jul 27 2012 Paul Wouters <pwouters at redhat.com> - 3.2.13-1
  - Updated to 3.2.13, addresses VU#517036 CVE-2012-2979