From: Jelte Jansen <jelte@isc.org>
Date: Fri, 15 Jun 2012 09:36:52 +0000 (+0200)
Subject: [master] Merge branch 'trac2027' with minor conflict
X-Git-Tag: trac2351_base~97^2~9^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbc27ca22d408ac333583edfce29c7651268f8f3;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2027' with minor conflict

Conflicts:
	src/lib/python/isc/ddns/tests/session_tests.py
---

dbc27ca22d408ac333583edfce29c7651268f8f3
diff --cc src/lib/python/isc/ddns/tests/session_tests.py
index 0239bb1e14,c7b45ab73e..f7c2d3cbde
--- a/src/lib/python/isc/ddns/tests/session_tests.py
+++ b/src/lib/python/isc/ddns/tests/session_tests.py
@@@ -662,8 -662,8 +662,8 @@@ class SessionTest(SessionTestBase)
             creates an update session, and fills it with the list of rrsets
             from 'updates'. Then checks if __handle()
             results in a response with rcode 'expected'.'''
-         msg = create_update_msg([TEST_ZONE_RECORD], [], updates)
+         msg = create_update_msg([TEST_ZONE_RECORD], prerequisites, updates)
 -        zconfig = ZoneConfig([], TEST_RRCLASS, self._datasrc_client,
 +        zconfig = ZoneConfig(set(), TEST_RRCLASS, self._datasrc_client,
                               self._acl_map)
          session = UpdateSession(msg, TEST_CLIENT4, zconfig)