]> git.ipfire.org Git - thirdparty/pdns.git/commit
projects / thirdparty / pdns.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 04b88f5) | patch
fix bindparser reduce conflicts 1111/head
authorStefan Bühler <stbuehler@web.de>
Mon, 18 Nov 2013 19:04:25 +0000 (20:04 +0100)
committerStefan Bühler <stbuehler@web.de>
Tue, 19 Nov 2013 11:55:55 +0000 (12:55 +0100)
commitdf58857e7ab7a43ff20460db3251068a094cca69
tree3ab4fc2fc1c0f1183387ebf7c7dbdb5d95cc0dbetree | snapshot
parent04b88f5a48be1ff2dc49bbe55821781ad104c110commit | diff
fix bindparser reduce conflicts

resolve reduce conflicts to what yacc defaulted to:

  * 'root_command' included 'command' directly and through
    'options_command' and 'zone_command'; separate option/zone commands
    for global usage, which don't include 'command' anymore.
  * 'command' included 'also_notify' and 'zone_also_notify'; yacc resolved
    conflict by defaulting to 'also_notify'; removed 'zone_also_notify'
    from global zone commands.
pdns/bindparser.yy diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.