From: Michal 'vorner' Vaner Date: Sat, 20 Oct 2012 09:11:33 +0000 (+0200) Subject: Merge #2207 X-Git-Tag: trac2402_base~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7868cb5a0cb2c276114c8d762a89bc59d8169df8;p=thirdparty%2Fkea.git Merge #2207 "define and implement (datasrc::memory::)ZoneUpdater class" It is now ZoneWriter. No changelog. Conflicts: src/lib/datasrc/memory/Makefile.am --- 7868cb5a0cb2c276114c8d762a89bc59d8169df8 diff --cc src/lib/datasrc/memory/Makefile.am index 6fce958039,25fc0fa40a..7b82269c0b --- a/src/lib/datasrc/memory/Makefile.am +++ b/src/lib/datasrc/memory/Makefile.am @@@ -21,10 -22,9 +21,13 @@@ libdatasrc_memory_la_SOURCES += zone_ta libdatasrc_memory_la_SOURCES += zone_finder.h zone_finder.cc libdatasrc_memory_la_SOURCES += zone_table_segment.h zone_table_segment.cc libdatasrc_memory_la_SOURCES += zone_table_segment_local.h zone_table_segment_local.cc +libdatasrc_memory_la_SOURCES += zone_data_updater.h zone_data_updater.cc +libdatasrc_memory_la_SOURCES += zone_data_loader.h zone_data_loader.cc +libdatasrc_memory_la_SOURCES += memory_client.h memory_client.cc + libdatasrc_memory_la_SOURCES += zone_writer.h + libdatasrc_memory_la_SOURCES += zone_writer_local.h zone_writer_local.cc + libdatasrc_memory_la_SOURCES += load_action.h + nodist_libdatasrc_memory_la_SOURCES = memory_messages.h memory_messages.cc EXTRA_DIST = rdata_serialization_priv.cc