Thank you for being able to resolve most of the branches. Leif had a hourly backup, so I was able to restore 7.1.x and 8.0.x to its original state.
Everything is good now! -Bryan > On Feb 15, 2019, at 12:34 AM, Chao Xu <ok...@apache.org> wrote: > > Hi All, > > I tried to restore the branches from my local repository by the > following command: > > 1. git checkout official official/XXX -b rXXX > 2. git push official rXXX:XXX > > The below branches are restored: > > 2.0.x > 3.0.x > 3.3.x > 4.0.x > 4.1.x > 4.2.x > 5.3.x > 6.0.x > 6.1.x > 6.2.x > 7.1.x > 8.0.x > 8.1.x > fix_tunnel_route > make_hwloc_required > quic-12 > quic-13 > quic-15 > > > - oknet > > Chao Xu <ok...@apache.org> 于2019年2月15日周五 下午3:37写道： >> >> I have a recently copy. >> >> bogon:oknet-ats oknet$ git branch -a | grep remotes/official >> remotes/official/2.0.x >> remotes/official/3.0.x >> remotes/official/3.2.x >> remotes/official/3.3.x >> remotes/official/4.0.x >> remotes/official/4.1.x >> remotes/official/4.2.1.x >> remotes/official/4.2.x >> remotes/official/5.0.x >> remotes/official/5.1.x >> remotes/official/5.2.x >> remotes/official/5.3.x >> remotes/official/6.0.x >> remotes/official/6.1.x >> remotes/official/6.2.x >> remotes/official/7.0.x >> remotes/official/7.1.x >> remotes/official/8.0.x >> remotes/official/8.1.x >> remotes/official/fix_tunnel_route >> remotes/official/lua_config >> remotes/official/make_hwloc_required >> remotes/official/master >> remotes/official/nexthop >> remotes/official/quic-05 >> remotes/official/quic-07 >> remotes/official/quic-11 >> remotes/official/quic-12 >> remotes/official/quic-13 >> remotes/official/quic-15 >> remotes/official/quic-latest >> remotes/official/voluspa >> bogon:net oknet$ git branch -a | grep remotes/official | while read >> BN; do git log -n1 $BN; done >> commit 640c4f738b7858f93069f987ea141e0cafae72da (official/2.0.x) >> Author: Leif Hedstrom <zw...@apache.org> >> Date: Thu Aug 26 23:43:27 2010 +0000 >> >> Added v2.0.1 to the release history. >> >> >> git-svn-id: >> https://svn.apache.org/repos/asf/trafficserver/traffic/branches/2.0.x@989977 >> 13f79535-47bb-0310-9956-ffa450edef68 >> commit 325610e763d038f21fc23db23ac43fd798193233 (official/3.0.x) >> Author: Brian Geffon <bri...@apache.org> >> Date: Tue Sep 18 11:41:28 2012 -0700 >> >> TS-1459: Backport regex_remap >> commit 245b59ef001d93f6beeb964e95cf9ae680a9071a (official/3.2.x) >> Author: Alan M. Carroll <a...@network-geographics.com> >> Date: Mon Jul 14 11:18:09 2014 -0500 >> >> TS-1475 - fix clang complaint for sync_cache_dir_on_shutdown >> commit d7606538896ac2fa74f9f453c3f7c409f92285b1 (official/3.3.x) >> Author: James Peach <jpe...@apache.org> >> Date: Thu Aug 8 14:43:06 2013 -0700 >> >> doc: whack sphinx documentation version >> commit 2bfb8fc951b1879d1931da6ba83d5fe3b1e451f2 (official/4.0.x) >> Author: Leif Hedstrom <zw...@apache.org> >> Date: Mon Oct 7 15:47:55 2013 -0600 >> >> Updated STATUS. >> commit ef46b2e887e6a1042e41452b08eecdd74d7e64a3 (official/4.1.x) >> Author: Igor Gali<C4><87> <i.ga...@brainsware.org> >> Date: Mon Mar 10 23:31:29 2014 +0100 >> >> Revert "TS-2172: Explicitly use subdir-objects in automake init" >> >> This reverts commit bebda9f791e908a7bb0a1563c450e5b01f4dde2c. >> >> The reason behind this revert is because it breaks all builds' >> distclean. igalic.failcounter += 1 >> >> Conflicts: >> CHANGES >> commit 2674e670f96baac4bd3058651c3475704fb49a13 (official/4.2.1.x) >> Author: Bryan Call <bc...@apache.org> >> Date: Tue Jul 22 18:57:56 2014 -0700 >> >> Updated version for the 4.2.1.1 release and added release notes >> commit 6ed0c571e0a81f627d7c1c04736da5bbbbd4338c (official/4.2.x) >> Author: Jon Sime <js...@apache.org> >> Date: Thu Apr 21 14:47:56 2016 +0000 >> >> docs: backporting rtd theme workaround >> commit d6b7ae3f586e7e779f37e86df41c47c909612fba (official/5.0.x) >> Author: Sudheer Vinukonda <sudhe...@yahoo-inc.com> >> Date: Fri Sep 12 16:59:39 2014 +0000 >> >> [TS-3035] - fix duplicate logging on error transactions >> commit edbbd083b813807097af6baa8edaf0cf5a7edf65 (official/5.1.x) >> Author: Alan M. Carroll <a...@apache.org> >> Date: Sat Dec 6 12:58:34 2014 -0600 >> >> CHANGES >> commit e5166fc3af2d12014d22a06b9e92a210f72e2d08 (official/5.2.x) >> Author: Leif Hedstrom <zw...@apache.org> >> Date: Mon Mar 30 10:02:43 2015 -0600 >> >> Updated release history >> commit bd7b9f0165c86ba3fe68e24a462ee454aafd2039 (official/5.3.x) >> Author: Persia Aziz <per...@yahoo-inc.com> >> Date: Mon Dec 19 11:17:51 2016 -0600 >> >> TS-5094: URL encoding in redirect pages >> commit b59020baa2f629c6a2f2478f1f45881f24ad1e2d (official/6.0.x) >> Author: Bryan Call <bc...@apache.org> >> Date: Mon Dec 14 19:41:04 2015 -0800 >> >> Updated the release notest for 6.0.1 >> commit 5712179404e1bace464d44d51b277dde684ee5b6 (official/6.1.x) >> Author: Thomas Jackson <jacksontj...@gmail.com> >> Date: Mon May 2 08:34:05 2016 -0700 >> >> TS-4403: Fix stale-while-revalidate on DNS lookup failures (#609) >> >> HostDB's "stale-while-revalidate" feature allows hostdb to return >> stale records while doing the DNS lookup in the background. This works >> properly in the case where the resolver goes away, but in the case >> that an error was returned from the resolver the record in cache was >> thrown away. This means that a transient error out in the DNS >> infrastructure would cause ATS to drop its stale record it would have >> contently served-- this patch simply makes hostdb honor its >> stale-while-revalidate contract (if configured). So, in the event that >> the DNS result comes back as `failed` hostdb will keep the old one if >> it is okay with being served stale. >> >> This closes #609 >> (cherry picked from commit 131875cbe7b0975c8c3c4f3d20aa55a5c7caba86) >> commit eaed59510bda6f1d27854d9d3f07aace2afffc16 (official/6.2.x) >> Author: Phil Sorber <sor...@apache.org> >> Date: Wed Jul 25 10:38:26 2018 -0600 >> >> Adding CHANGELOG-6.2.3 >> commit 444c490a2b6dff29966034d0f94618f9582db813 (official/7.0.x) >> Author: Oknet Xu <xuc...@skyguard.com.cn> >> Date: Sat Dec 3 13:07:38 2016 +0800 >> >> TS-5076: Test and set the in_enabled_list by atomic function >> >> (cherry picked from commit f84b4333d2743a8275f4974e32c733e989968a67) >> commit 14963f60987c80e024b5618ebd400ad9aa8a4fad (official/7.1.x) >> Author: Evan Zelkowitz <19699200+ezelk...@users.noreply.github.com> >> Date: Wed Jan 30 14:07:20 2019 -0700 >> >> Manually brought in changes from #4797 >> >> commit 58b154bb6f253ac8660bd778dd2bf43cb7b60687 >> >> Updated to use ts::string_view >> commit 82fcc3ca27e7310c6bab41ef83f9620a6716be3f (official/8.0.x) >> Author: Leif Hedstrom <zw...@apache.org> >> Date: Tue Feb 12 11:52:44 2019 -0700 >> >> Updated ChangeLog >> commit 2a089062773fa6b7db985a18f841e5c1a8d85a44 (official/8.1.x) >> Merge: f85912775 e8ee82656 >> Author: Bryan Call <bc...@apache.org> >> Date: Wed Jan 9 09:36:43 2019 -0800 >> >> Merge branch '8.0.x' into 8.1.x >> >> Conflicts: >> configure.ac >> tools/package/trafficserver.spec >> commit e4d4b3d11868597aaa2d9cd21280d4d0339464a2 (official/fix_tunnel_route) >> Author: Susan Hinrichs <shinr...@oath.com> >> Date: Mon Nov 5 19:30:37 2018 +0000 >> >> Add debug in curl >> commit ea5fb9f6fd4c19c70e91dfdab6c1462cc5457171 (official/lua_config) >> Author: Leif Hedstrom <zw...@apache.org> >> Date: Tue Mar 25 21:23:03 2014 -0600 >> >> x >> commit 08dc4910f329b8003ff4d4f1f1e130232723f0d2 >> (official/make_hwloc_required) >> Author: Phil Sorber <sor...@apache.org> >> Date: Thu Sep 8 13:19:14 2016 -0600 >> >> Checkpoint >> commit 8213ca0293f5b47b0291c0eb3ae083afe1457004 (official/master) >> Author: Alan M. Carroll <a...@apache.org> >> Date: Thu Feb 7 18:00:18 2019 -0600 >> >> HdrHeap: refresh for C++17. >> commit d7c78cf93dcc965c11731272b66293b4863d845f (official/nexthop) >> Author: Kit Chan <kic...@apache.org> >> Date: Mon May 21 21:48:27 2018 -0700 >> >> support TSHttpSsnIdGet() in lua plugin >> commit dbec5935992d212781e0f3925484d08857df4046 (official/quic-05) >> Author: Masakazu Kitajo <mas...@apache.org> >> Date: Mon Oct 16 17:28:32 2017 +0900 >> >> Fix packet number decoding >> >> It was not decoded correctly when packets were not sequential. >> >> (cherry picked from commit a739464caef585a11ca82d927429371d61187b49) >> commit 069f3e8c2ab9abcb8b3798e4276fd0a6daee1c12 (official/quic-07) >> Merge: 9786e2b85 8581d6b10 >> Author: Leif Hedstrom <zw...@apache.org> >> Date: Tue Dec 12 13:09:57 2017 -0700 >> >> Merge branch 'master' into quic-latest >> >> * master: >> uDNS no longer redirects NXDOMAIN to lo >> fix post-redirect test >> removes unused public ip option from microserver code >> Changing all *Debug* macros to *Debug >> Cleanup of bool conversion in Ptr.h for C++11. >> Update the autest.sh script that runs from Jenkins >> Add httpbin extension in Autest >> Fix typo >> remove hack for traffic_top update base version to 1.4.1 for autest >> Add closedir for dangling dir pointer >> Fix wildcard entry for SNI config >> Create system_stats plugin. This will insert system information >> in to the stats list on a five second interval. Currently it pulls >> load averages, number of processes, and most of the information from >> sysfs for each available network device. >> Removes DES-CBC3-SHA from the default cipher list (again...) >> commit 788304b4931d4ac15f2d4ce3eb76559cec491f71 (official/quic-11) >> Author: Masaori Koshiba <masa...@apache.org> >> Date: Fri Jun 8 11:47:15 2018 +0900 >> >> Add aead_tag_len in long packet header size calculation >> commit 38104e981d592bc95271f8fb3eca95cb29b16443 (official/quic-12) >> Merge: 636548084 2ded01373 >> Author: Masaori Koshiba <masa...@apache.org> >> Date: Wed Aug 1 09:58:19 2018 +0900 >> >> Merge branch 'asf/master' into quic-latest >> >> * asf/master: (44 commits) >> Updates the default ciphers to avoid weak ciphers(non FS) >> Fixed Spelling. >> Removes remnants of dprintf support >> Change the defauilt connect_ports docs to reflect the code >> Fixing copy paste error in SNI yaml parsing >> Removes more references to traffic_cop and cop related functionality >> Fixes ticket loading from filesystems without a mtime >> Add support for 'fwd' value to X-Debug header, and move to later >> hook any deletion of X-Debug header from client request. >> For PostScript class, remove problematic parameter forwarding to >> functor (rely on lambda capturing instead). >> Modifies init script to add start/reload hooks >> fix another crash on shutdown and add unlikely >> Revert "Do not do DNS to origin if the object is HIT-STALE and >> parent exists" >> Dockerfile for CentOS/Fedora, i.e. yum dependencies >> Revert "Fix post process to propagate early server response." >> Revert "Fix post_error test by initializating the address length >> of the accept call." >> Revert "Fix crashes from early post return fix." >> Removes old commented-out code >> Test: Convert test_Ptr.cc to Catch. >> TextView: Unit tests for token handling on single characters, >> and with trim. >> TS-4765: Removes previously deprecated cqbl and pqbl log tags >> ... >> commit 00953882b5f29686bdcec69216413bdcd86e177e (official/quic-13) >> Author: Masakazu Kitajo <mas...@apache.org> >> Date: Tue Sep 11 17:36:44 2018 +0900 >> >> Add const qualifier to _hs_protocol >> commit 447c7f6ca88df2873762b4df20eb14e15ef186bb (official/quic-15) >> Merge: 7c2b65a43 04bfb458c >> Author: Masakazu Kitajo <mas...@apache.org> >> Date: Thu Jan 17 13:48:16 2019 +0900 >> >> Merge branch 'master' into quic-latest >> >> Conflicts: >> iocore/net/P_UnixNetVConnection.h >> lib/records/I_RecHttp.h >> commit e319305aa7bbfeded37fe5ad7cf244505c266e83 (official/quic-latest) >> Author: Masakazu Kitajo <mas...@apache.org> >> Date: Fri Feb 8 11:43:03 2019 +0900 >> >> Fix eternal PING bug >> commit ca6cf23dd0d752d6be41f1f838d134ad8ab380ee (official/voluspa) >> Author: Miles Libbey <mlib...@apache.org> >> Date: Sun Nov 4 08:54:52 2018 -0800 >> >> Doc: Describe parent weight and format >> >> In Issue #4549, realized that the parent weights were never >> documented. In the version >> that shall not be named, there was an example that had a weight, >> but, it was not mentioned >> in the text. >> >> 宋辰伟 <616955...@qq.com> 于2019年2月15日周五 下午2:38写道： >>> >>> HI all >>> >>> I am so Sorry. I made some mistakes to delete several branch on github. >>> And I don’t have any of these branch in my local. Can someone help me to >>> recover it ? >>> >>> Really sorry and really thanks . >>> >>> Scw00 >>> >>> >> >> >> -- >> - Oknet Xu > > > > -- > - Oknet Xu
