diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:23:26 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:25:08 +0100 |
| commit | 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch) | |
| tree | 3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/stderr/0557 | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/stderr/0557')
| -rw-r--r-- | test/stderr/0557 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/stderr/0557 b/test/stderr/0557 index 8e5906ca8..19fd8c29f 100644 --- a/test/stderr/0557 +++ b/test/stderr/0557 @@ -1,2 +1,2 @@ LOG: MAIN - error in r1 router: no host(s) specified for domain * + error in r1 router: no host(s) specified for domain test.ex |