This is an automated email from the ASF dual-hosted git repository. maskit pushed a change to tag bazinga/6.1.2/4 in repository https://gitbox.apache.org/repos/asf/trafficserver.git
*** WARNING: tag bazinga/6.1.2/4 was deleted! *** was 15f0fafa59 Merge conflict This change permanently discards the following revisions: discard 15f0fafa59 Merge conflict discard 35d17c15f6 Revert "Correctly mark the file update as inactive once the swap has been completed" discard a7e2f58c14 Revert "Allow for loopback addresses in a hosts file" discard d9060b7b8d Merge conflicts discard 14facaca97 Revert "HostDB HTTP UI: Add a listall endpoint. This closes #240" discard 05c66d2565 Revert "HostDB HTTP UI: Fix merge issue. This closes #240" discard 84293fdc7c Revert "HostDB HTTP UI: Fix merge issue. This closes #240" discard 41a7ab2fca Revert "clang-format ... Also, why was there no Jira with these changes?" discard 1e8930c3b5 Merge COnflicts discard 0b6d9c1e15 Revert "TS-3773: HostDB view all: add more detail for RR records" discard 110f7c1d5e Revert "TS-3773 clang-format" discard 768d19f454 Revert "TS-3774: Fix memory leak issue in host file parsing for HostDB." discard 184114d8ed Revert "TS-3774 clang-format" discard 8536c1f0c9 Revert "TS-3800: HostDB UI: support json output, improve srv records, add hostnames" discard 839a02b56a Revert "TS-3803: CID 1313322 CID 1313322: HostDB memory issues (introduced in TS-3800)" discard 8d0cb0911b Revert "TS-3800: Fix bug in hostdb ui related to missing query" discard 587c6b7296 Revert "TS-3942: Crash when enumerating HostDB records in HostDB UI" discard 64e6109f9d Merge branch 'asf/6.1.x' into 6.1.x discard f0eb9f852a Merge branch 'asf/6.1.x' into 6.1.x discard a16d476ce9 Merge branch 'asf/6.1.x' into 6.1.x discard 51e7d385ee Merge branch 'asf/6.1.x' into 6.1.x discard 7ac2a3fa45 Merge branch 'asf/6.1.x' into 6.1.x discard 24e11bfdd4 Merge branch 'asf/6.1.x' into 6.1.x discard b3782a5a36 Update CHANGES with 6.1.1 backports discard cc017c0ed8 Bump version to 6.1.1 discard 3002d49f73 TS-4142: use uint32_t in preference to non-standard u_int32_t discard 97c3a51e94 TS-4165 Logging breaks if changing log format. This closes #446. discard 56db775c98 TS-4168: Only close inactive and active connections that have discard c679abdcbf Merge branch 'asf/6.1.x' into 6.1.x discard b4132f0075 Merge branch 'asf/6.1.x' into 6.1.x discard abfe41880a Merge branch 'asf/6.1.x' into 6.1.x discard 6f7f5bdabc Merge remote-tracking branch 'origin/asf/6.1.x' into 6.1.x discard e2ffd1bea8 Update CHANGES with latest Coverity and build fixes discard c82179eb90 TS-4140 Fixes a coverity warning due to changes in TS-4106 (dead code) discard bde4ba5051 TS-4141: Null check fix. discard 86f53b1669 TS-4142: various casting fixes for OmniOS discard 0a60613cf5 TS-4139: Send GOAWAY if it failed to change stream state discard 5580c784be Added TS-4134 discard 28c51d5922 TS-4134 Fixes clang-format discard 47c42e5795 TS-4134: Fix privilege elevation issues. discard da2d6d7817 Updated with new backports discard 1ac9dbc306 fix NetHandler::manage_keep_alive_queue and NetHandler::manage_active_queue bug discard 5cb6a4c327 TS-4118: Fix format of a error message discard 687682e06c TS-4118: CID 1347871: Add error handling in HPACK_Encode discard 8add7b9f99 TS-3478: clang-format discard 93ae18bce5 TS-3967: Set stream state to close after a RST_STEAM has been sent discard 958175b246 TS-3478: Indexing header representations on HPACK encoder discard 5acdc2294d TS-4097: clang-format discard 088022a9f3 TS-4097: Encode empty string properly with HPACK discard 6267e4a127 Merge branch 'asf/6.1.x' into 6.1.x discard 6bd780aefe Merge branch 'asf/6.1.x' into 6.1.x discard 5ba67f719e Merge branch 'asf/6.1.x' into 6.1.x discard 70a5e41113 Merge branch 'asf/6.1.x' into 6.1.x discard d7a2fed7cd Merge branch 'asf/6.1.x' into 6.1.x discard 814c336b3d Merge branch 'asf/6.1.x' into 6.1.x discard 72b7cb1635 Merge branch 'apple/15983473' into 6.1.x discard 786c7b4ee9 <rdar://problem/15983473> Add our own custom Layout