Commit 0773f534 authored by Libor Peltan's avatar Libor Peltan

Merge branch 'one_check' into 'master'

journal: removed already bad check

See merge request !783
parents 7cefb371 baf39d33
......@@ -362,14 +362,6 @@ int zone_in_journal_store(conf_t *conf, zone_t *zone, zone_contents_t *new_conte
/* Check for disabled zonefile synchronization. */
conf_val_t val = conf_zone_get(conf, C_ZONEFILE_SYNC, zone->name);
if (conf_int(&val) >= 0) {
// for now we better flush the zonefile instead of zone-in-journal
// when the priority over zonefile and journal changes, replace this check
changeset_t *co_ch = changeset_from_contents(new_contents);
int ret = co_ch ? zone_change_store(conf, zone, co_ch) : KNOT_ENOMEM;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment