From: Mukund Sivaraman <muks@isc.org>
Date: Mon, 11 Feb 2013 04:01:12 +0000 (+0530)
Subject: Merge branch 'master' into trac2672
X-Git-Tag: bind10-1.0.0-rc-release~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=660a0d164feaf055677f375977f7ed327ead893e;p=thirdparty%2Fkea.git

Merge branch 'master' into trac2672

Conflicts:
	src/lib/python/isc/ddns/session.py
---

660a0d164feaf055677f375977f7ed327ead893e
diff --cc src/lib/python/isc/ddns/session.py
index b9b44f35ac,373a39db9d..3368523fdb
--- a/src/lib/python/isc/ddns/session.py
+++ b/src/lib/python/isc/ddns/session.py
@@@ -850,10 -850,10 +850,10 @@@ class UpdateSession
                      self.__do_update_delete_rrs_from_rrset(rrset)
  
              self.__diff.commit()
-             return Rcode.NOERROR()
+             return Rcode.NOERROR
          except isc.datasrc.Error as dse:
 -            logger.info(LIBDDNS_UPDATE_DATASRC_ERROR, dse)
 +            logger.info(LIBDDNS_UPDATE_DATASRC_COMMIT_FAILED, dse)
-             return Rcode.SERVFAIL()
+             return Rcode.SERVFAIL
          except Exception as uce:
              logger.error(LIBDDNS_UPDATE_UNCAUGHT_EXCEPTION,
                           ClientFormatter(self.__client_addr),