[quicwg/base-drafts] b3c49d: Revert merge snafu
Martin Thomson <martin.thomson@gmail.com> Tue, 13 March 2018 15:14 UTC
Return-Path: <bounce+565321.40f-quic-issues=ietf.org@github.com>
X-Original-To: quic-issues@ietfa.amsl.com
Delivered-To: quic-issues@ietfa.amsl.com
Received: from localhost (localhost [127.0.0.1]) by ietfa.amsl.com (Postfix) with ESMTP id 56D8912D946 for <quic-issues@ietfa.amsl.com>; Tue, 13 Mar 2018 08:14:28 -0700 (PDT)
X-Virus-Scanned: amavisd-new at amsl.com
X-Spam-Flag: NO
X-Spam-Score: -0.498
X-Spam-Level:
X-Spam-Status: No, score=-0.498 tagged_above=-999 required=5 tests=[BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NML_ADSP_CUSTOM_MED=0.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=no autolearn_force=no
Authentication-Results: ietfa.amsl.com (amavisd-new); dkim=pass (1024-bit key) header.d=github.com
Received: from mail.ietf.org ([4.31.198.44]) by localhost (ietfa.amsl.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rs3U6tDWcPhd for <quic-issues@ietfa.amsl.com>; Tue, 13 Mar 2018 08:14:27 -0700 (PDT)
Received: from m69-170.mailgun.net (m69-170.mailgun.net [166.78.69.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ietfa.amsl.com (Postfix) with ESMTPS id EE67412E056 for <quic-issues@ietf.org>; Tue, 13 Mar 2018 08:14:25 -0700 (PDT)
DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=github.com; q=dns/txt; s=mailo; t=1520954065; h=Content-Transfer-Encoding: Content-Type: Mime-Version: Subject: Message-ID: To: Reply-To: From: Date: Sender; bh=fFL6hv4wKOjUeNRyVL6qWVFfmS71XmUN8Om5JtRSnAw=; b=ODwpw9vBm0elu+nTm2UeAEd4GQDRMsgFhqDU49jBKw4EzTsgQapH+Q8YHzDcK3/kooneFD9+ nPKBJ7VNDv6VaqGCh5xZqyqVW3CKdxVJXkYDNk5VJhm9i/vk7EP8xwKBWjqlZVqdeUkxetW6 Su2ceIT2ahNbo64fBv5ufUSXzvM=
X-Mailgun-Sid: WyJhNzYyYiIsICJxdWljLWlzc3Vlc0BpZXRmLm9yZyIsICI0MGYiXQ==
X-Mailgun-Sending-Ip: 166.78.69.170
Sender: martin.thomson=gmail.com@github.com
Received: from github.com (Unknown [192.30.252.34]) by mxa.mailgun.org with ESMTP id 5aa7ead0.7f0bb8677a80-smtp-out-n03; Tue, 13 Mar 2018 15:14:24 -0000 (UTC)
Date: Tue, 13 Mar 2018 08:14:24 -0700
From: Martin Thomson <martin.thomson@gmail.com>
Reply-To: Martin Thomson <martin.thomson@gmail.com>
To: quic-issues@ietf.org
Message-ID: <5aa7ead0d868e_58722aff530cbc146172c@hookshot-fe-7191cb1.cp1-iad.github.net.mail>
Subject: [quicwg/base-drafts] b3c49d: Revert merge snafu
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="--==_mimepart_5aa7ead0d82c9_58722aff530cbc14616ab"; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Archived-At: <https://mailarchive.ietf.org/arch/msg/quic-issues/45l0J8T1lJViHh1ZnQTNdaRsS-U>
X-BeenThere: quic-issues@ietf.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: Notification list for GitHub issues related to the QUIC WG <quic-issues.ietf.org>
List-Unsubscribe: <https://www.ietf.org/mailman/options/quic-issues>, <mailto:quic-issues-request@ietf.org?subject=unsubscribe>
List-Archive: <https://mailarchive.ietf.org/arch/browse/quic-issues/>
List-Post: <mailto:quic-issues@ietf.org>
List-Help: <mailto:quic-issues-request@ietf.org?subject=help>
List-Subscribe: <https://www.ietf.org/mailman/listinfo/quic-issues>, <mailto:quic-issues-request@ietf.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Mar 2018 15:14:28 -0000
Branch: refs/heads/master Home: https://github.com/quicwg/base-drafts Commit: b3c49d8d47c7ed1af1a931b8567af11c0c19407b https://github.com/quicwg/base-drafts/commit/b3c49d8d47c7ed1af1a931b8567af11c0c19407b Author: Martin Thomson <martin.thomson@gmail.com> Date: 2018-03-13 (Tue, 13 Mar 2018) Changed paths: M draft-ietf-quic-invariants.md Log Message: ----------- Revert merge snafu
- [quicwg/base-drafts] b3c49d: Revert merge snafu Martin Thomson