From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 5 Dec 2012 19:34:59 +0000 (-0800)
Subject: [master] Merge branch 'trac2382'
X-Git-Tag: bind10-1.0.0-beta-release~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6865a7686a02c7026150be1304ee682e8ddbb51;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2382'
with fixing Conflicts for
	src/lib/dns/gen-rdatacode.py.in
	src/lib/dns/rdata.cc
	src/lib/dns/rrparamregistry-placeholder.cc
	src/lib/dns/tests/rdata_hinfo_unittest.cc
	src/lib/dns/tests/rdata_txt_like_unittest.cc
---

a6865a7686a02c7026150be1304ee682e8ddbb51
diff --cc src/lib/dns/gen-rdatacode.py.in
index 5f0f2ef9c7,6a9ff8aca5..72b7674355
--- a/src/lib/dns/gen-rdatacode.py.in
+++ b/src/lib/dns/gen-rdatacode.py.in
@@@ -24,16 -24,6 +24,16 @@@ from os.path import getmtim
  import re
  import sys
  
 +# new_rdata_factory_users[] is a list of tuples of the form (rrtype,
 +# rrclass). Items in the list use the (new) RdataFactory class, and
 +# items which are not in the list use OldRdataFactory class.
 +# Note: rrtype and rrclass must be specified in lowercase in
 +# new_rdata_factory_users.
 +#
 +# Example:
 +#     new_rdata_factory_users = [('a', 'in'), ('a', 'ch'), ('soa', 'generic')]
- new_rdata_factory_users = []
++new_rdata_factory_users = [('aaaa', 'in')]
 +
  re_typecode = re.compile('([\da-z]+)_(\d+)')
  classcode2txt = {}
  typecode2txt = {}