summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release-1.2.6' into 'master' v1.2.6Ondřej Surý2017-04-242-1/+23
|\
| * NEWS: prepare for 1.2.6Vladimír Čunát2017-04-242-1/+23
|/
* Merge branch 'deckard-update' into 'master' Ondřej Surý2017-04-241-0/+0
|\
| * Update deckard to latest masterOndřej Surý2017-04-241-0/+0
|/
* Merge branch 'respdiff-allow-failure' into 'master' Ondřej Surý2017-04-241-0/+1
|\
| * Allow canceling respdiff without penaltyOndřej Surý2017-04-241-0/+1
|/
* Merge !278: lib/nsrep: revert some changes from commit 5581cf9b Vladimír Čunát2017-04-241-9/+9
|\
| * lib/nsrep: revert some changes from commit 5581cf9bGrigorii Demidov2017-04-211-9/+9
* | Merge !277: dnssec/nsec: fix wildcards directly under the rootVladimír Čunát2017-04-241-1/+1
|\ \ | |/ |/|
| * dnssec/nsec: fix wildcard_match_check() to allow processing of *. wildcardGrigorii Demidov2017-04-191-1/+1
|/
* Merge branch 'ci-respdiff' into 'master' Petr Špaček2017-04-191-0/+19
|\
| * CI: run respdiff using docker image in Gitlab CIJan Holusa2017-04-131-0/+19
* | Merge branch 'rrcache-pkt-clobber' into 'master' Petr Špaček2017-04-181-1/+16
|\ \
| * | rrcache: don't clobber pkt if failing the second stepVladimír Čunát2017-04-181-1/+16
| |/
* | Merge branch 'fix-oo-wc-nodata' into 'master' Vladimír Čunát2017-04-182-1/+9
|\ \ | |/ |/|
| * dnssec/nsec3: don't set AD flag in properly signed wildcard nodata answerGrigorii Demidov2017-04-132-1/+9
* | Merge !272: dnssec/signature: fix wildcard signaturesVladimír Čunát2017-04-131-9/+38
|\ \ | |/ |/|
| * dnssec/signature: fix wildcard signaturesGrigorii Demidov2017-04-131-9/+38
|/
* Merge branch 'refused-retry' into 'master' Petr Špaček2017-04-102-3/+2
|\
| * iterator: don't retry if REFUSEDVladimír Čunát2017-04-072-3/+2
* | Merge branch '1.2' into 'master' Ondřej Surý2017-04-052-6/+6
|\|
| * Merge branch 'strip-dev-from-1.2.5' into '1.2' v1.2.5Ondřej Surý2017-04-051-1/+1
| |\
| | * Strip -dev suffix from version numberOndřej Surý2017-04-051-1/+1
| |/
| * Merge !263: NEWS: nitpicks in 1.2.5 entriesVladimír Čunát2017-04-051-4/+4
| |\
| | * NEWS: nitpicks in 1.2.5 entriesVladimír Čunát2017-04-051-4/+4
| * | Merge branch 'release-1.2.5' into '1.2' Ondřej Surý2017-04-051-1/+1
| |\ \
| | * | Update NEWS for 1.2.5 releaseOndřej Surý2017-04-051-1/+1
| |/ /
| * | Merge branch '1.2-keep-autogenerated-protobuf-c' into '1.2' Ondřej Surý2017-04-054-5/+866
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'origin/master' into 1.2Ondřej Surý2017-04-054-5/+866
| |/| | |/ |/|
* | Merge branch 'keep-autogenerated-protobuf-c-files' into 'master' Ondřej Surý2017-04-054-5/+866
|\ \
| * | Include protobuf-c generated files in the repositoryOndřej Surý2017-04-054-5/+866
|/ /
| * Merge branch 'rsync-travis-fix' into '1.2' Ondřej Surý2017-04-052-15/+22
| |\
| | * Merge remote-tracking branch 'origin/master' into 1.2Ondřej Surý2017-04-052-15/+22
| |/| | |/ |/|
* | Merge branch 'travis-fix' into 'master' Ondřej Surý2017-04-051-15/+21
|\ \
| * | Fix duplicate python installationOndřej Surý2017-04-051-1/+7
| * | Use packages from brew on OS XOndřej Surý2017-04-051-15/+15
* | | Merge branch 'travis-fix' into 'master' Ondřej Surý2017-04-051-0/+1
|\| |
| * | Workaround the Travis-CI bugOndřej Surý2017-04-051-0/+1
|/ /
| * Merge branch '1.2-resync' into '1.2' Ondřej Surý2017-04-053-5/+6
| |\ | |/ |/|
* | Merge branch '1.2-merge-master' into 'master' Ondřej Surý2017-04-052-2/+38
|\ \
| * \ Merge remote-tracking branch 'origin/master' into 1.2Ondřej Surý2017-04-053-5/+6
| |\ \ | |/ / |/| / | |/
* | Merge branch 'log_rrsig_validity' into 'master' Ondřej Surý2017-04-051-1/+1
|\ \
| * | layer/validate: clarify message about missing *valid* RRSIGsPetr Špaček2017-04-051-1/+1
|/ /
* | Merge !255: fix travis, update libknotVladimír Čunát2017-04-042-4/+5
|\ \
| * | bootstrap-depends.sh: libknot: 2.3.3 -> 2.4.2Vladimír Čunát2017-04-041-1/+1
| * | dnstap.mk: another shot at Travis failuresVladimír Čunát2017-04-041-0/+1
| * | bootstrap-depends.sh: switch protobuf to 2.xVladimír Čunát2017-04-041-3/+3
| | * Merge branch 'release-1.2.5' into '1.2' Ondřej Surý2017-04-0561-299/+2590
| | |\
| | | * Add kresc into NEWSOndřej Surý2017-04-041-0/+1
| | | * Prepare 1.2.5 releaseOndřej Surý2017-04-042-2/+37