[Swan-dev] merging doubt

[Paul Wouters]

On Sun, 14 Jun 2015, D. Hugh Redelmeier wrote:

> | From: Paul Wouters <paul at nohats.ca>
>
> | odd. and there are no merge conflicts left unresolved??
>
> My fault: I resolved a merge conflict the wrong way.  It turns out
> that enc_payload_summary was blown away in the rfc7383 changes but a
> little crept back in the merge.

But you did not push? So I guess you are running test cases now?

I screwed up my overnight run, so rerunning now. But I realised the
liveness tests are getting screwed up by systemd restarting pluto
when our testcase runs killall -9 pluto. It's time to use that
impair-send-no-delete instead and shut things down properly.

so rerunning the liveness tests....

Paul