]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch trac1261 with fixing conflicts, etc.
authorJINMEI Tatuya <jinmei@isc.org>
Thu, 6 Oct 2011 18:22:25 +0000 (11:22 -0700)
committerJINMEI Tatuya <jinmei@isc.org>
Thu, 6 Oct 2011 18:22:25 +0000 (11:22 -0700)
commitc96f735cd5bbbd8be3c32e7d40f264ebfa889be5
treecd13ce9019ea6b94d5619eb5f40910d93b87e61a
parent90ab0a155bc5e42ef2ad35569968dd3db9c501bb
parent95cbc4efbaab12b66852ede318cb9af0d3f8780b
[master] Merge branch trac1261 with fixing conflicts, etc.
- I need to add another mock method in xfrin/test to be compatible with the
  latest version of Diff class.
- I also replaced 'remove' with 'delete' more completely in the Diff class
  (and adjusted the caller side accordingly) for consistency.
configure.ac
src/bin/xfrin/tests/xfrin_test.py
src/lib/datasrc/sqlite3_accessor.cc
src/lib/python/isc/xfrin/diff.py
src/lib/python/isc/xfrin/tests/diff_tests.py