Skip to content

[NTP] Revert change in PR 2598#4265

Merged
yxieca merged 1 commit intosonic-net:masterfrom
yxieca:ntp
Mar 19, 2020
Merged

[NTP] Revert change in PR 2598#4265
yxieca merged 1 commit intosonic-net:masterfrom
yxieca:ntp

Conversation

@yxieca
Copy link
Copy Markdown
Contributor

@yxieca yxieca commented Mar 16, 2020

- What I did

We believe that the supervisord issue in face of clock rolling backwards
has been addressed. Therefore reverting change 2598 to allow ntp sync
to right clock at the start up time.

Signed-off-by: Ying Xie ying.xie@microsoft.com

We believe that the supervisord issue in face of clock rolling backwards
has been addressed. Therefore reverting change 2598 to allow ntp sync
to right clock at the start up time.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
@jleveque
Copy link
Copy Markdown
Contributor

@yxieca
Copy link
Copy Markdown
Contributor Author

yxieca commented Mar 17, 2020

retest vsimage please

@yxieca yxieca merged commit 4d0b1bb into sonic-net:master Mar 19, 2020
@yxieca yxieca deleted the ntp branch March 19, 2020 15:50
yxieca added a commit that referenced this pull request Mar 19, 2020
We believe that the supervisord issue in face of clock rolling backwards
has been addressed. Therefore reverting change 2598 to allow ntp sync
to right clock at the start up time.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
rlhui pushed a commit that referenced this pull request Mar 23, 2020
We believe that the supervisord issue in face of clock rolling backwards
has been addressed. Therefore reverting change 2598 to allow ntp sync
to right clock at the start up time.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 24, 2020
We believe that the supervisord issue in face of clock rolling backwards
has been addressed. Therefore reverting change 2598 to allow ntp sync
to right clock at the start up time.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
mssonicbld added a commit that referenced this pull request Mar 13, 2026
…lly (#25846)

#### Why I did it
src/sonic-swss
```
* 4b8f649 - (HEAD -> master, origin/master, origin/HEAD) Merge pull request #4261 from bibhuprasad-hcl/bibhu_swss_p4_branch14 (2 hours ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log a367ddb - [P4Orch] Remove code associated with old L3 multicast database format. (6 hours ago) [mint570]
|/ 
* f94622a - Optimize memory usage in ResponsePublisher queue (#4328) (7 hours ago) [Santhosh Thodupunoori]
* dc7210f - Merge pull request #4258 from bibhuprasad-hcl/bibhu_swss_p4_branch_11_12_13 (8 hours ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log 49df9e7 - [P4Orch]Migrate to use updateMulticastGroupEntries, verifyState to new database schema format, processMulticastGroupEntries and drainMulticastGroupEntries. (13 hours ago) [mint570]
|/ 
* d084258 - Suppressing the ERR logs (#4265) (35 hours ago) [Dhanasekar Rathinavel]
* 6a931d9 - Fix debug flexcounter uninstall to skip non-PHY ports (#4103) (2 days ago) [manish1-arista]
* fa37c5c - [Marvell-Teralynx][PFCWD]: Fix pfc_detect filename to align with asic_type (#3968) (2 days ago) [jithenderkondam]
* 57b12c1 - Merge pull request #4238 from ksravani-hcl/p4orch_g3 (4 days ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log 6b52aae - Add IPv6 src IP as new ternary key field for table ipv6_tunnel_termination_table (6 days ago) [mint570]
|/ 
* e09a0d0 - Merge pull request #4169 from divyagayathri-hcl/ip_multicast_5 (6 days ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log b96ec61 - [P4Orch] Implement drain, validate and verifyState entry functions in IP multicast table manager. (6 days ago) [mint570]
|/ 
* bebc9e4 - Merge pull request #4163 from divyagayathri-hcl/ip_multicast_3 (6 days ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log 0df5456 - [P4Orch] Implement createIpMulticastEntries, deleteIpMulticastEntries & updateIpMulticastEntries in new IP multicast table manager. (7 days ago) [mint570]
|/ 
* 558a6d8 - Merge pull request #4175 from ksravani-hcl/sws_7 (7 days ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log 45a1e14 - Enable use of SAI L2 multicast and add p4orch mocks (7 days ago) [mint570]
|/ 
* 6daa5ce - Merge pull request #4147 from divyagayathri-hcl/sws_4 (7 days ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log 2ffdab3 - Add TunnelDecapGroupManager (8 days ago) [mint570]
|/ 
* ef37109 - Merge pull request #4082 from divyagayathri-hcl/set_ip_nexthop_and_disable_rewrites (8 days ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log c1f53c5 - Merge branch 'master' into set_ip_nexthop_and_disable_rewrites (8 days ago) [divyagayathri-hcl]
| |\ 
| |/ 
|/| 
* | e108aec - [DASH] Add support for multiple trusted VNI ranges and values (#4252) (8 days ago) [Lawrence Lee]
* | 5426194 - Merge pull request #4132 from divyagayathri-hcl/18_multicast (9 days ago) [StephenWangGoogle]
|\ \ 
| failure_prs.log skip_prs.log | dc55967 - [P4Orch] Update route manager & verifyState validate functions and to implement drain rout entried to support multicast action. (9 days ago) [mint570]
|/ / 
| failure_prs.log skip_prs.log aba1104 - [P4Orch] Add support for action set_ip_nexthop_and_disable_rewrites in the next hop manager. (10 days ago) [mint570]
|/ 
* 3f77e90 - Merge pull request #4250 from bibhuprasad-hcl/bibhu_swss_p4_branch_8_9_10 (10 days ago) [StephenWangGoogle]
* 179e86f - [P4Orch] Migrate to new schema format for REPLICATION_MULTICAST_TABLE and to use addMulticastGroupEntries and deleteMulticastGroupEntries. (11 days ago) [mint570]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants