Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[sonic-yang-mgmt]: Fixing issues caused by conflict resolution. #82

Merged
merged 1 commit into from
Jun 30, 2020
Merged

[sonic-yang-mgmt]: Fixing issues caused by conflict resolution. #82

merged 1 commit into from
Jun 30, 2020

Conversation

praveen-li
Copy link
Collaborator

Signed-off-by: Praveen Chaudhary pchaudhary@linkedin.com

- What I did
Fixing issues caused by conflict resolution.
- How I did it

- How to verify it
All PKG have tests now, they are building fine.

pchaudha@server05:/home/pchaudha/srcCode/dpb_repo$ date
Tue Jun 30 13:56:42 PDT 2020
pchaudha@server05:/home/pchaudha/srcCode/dpb_repo$ ls -l target/python-debs/python-sonic-utilities_1.2-1_all.deb
-rw-r--r-- 1 pchaudha pchaudha 153240 Jun 30 13:45 target/python-debs/python-sonic-utilities_1.2-1_all.deb
pchaudha@server05:/home/pchaudha/srcCode/dpb_repo$ ls -l target/python-wheels/sonic_yang_mgmt-1.0-py2-none-any.whl
-rw-r--r-- 1 pchaudha pchaudha 19409 Jun 30 12:19 target/python-wheels/sonic_yang_mgmt-1.0-py2-none-any.whl
pchaudha@server05:/home/pchaudha/srcCode/dpb_repo$

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

[sonic-yang-mgmt]: Fixing issues caused by conflict resolution.
dbaba73 
Signed-off-by: Praveen Chaudhary pchaudhary@linkedin.com
@praveen-li praveen-li merged commit 19c6467 into zhenggen-xu:sonic-cfg-mgmt Jun 30, 2020
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Aug 12, 2020
@jleveque
[sonic-platform-daemons] Update submodule (sonic-net#5128)
5e62d8d 
* src/sonic-platform-daemons 8e0704e...da3dfbb (1):
  > [xcvrd][thermalctld] Add logger instances for helper functions and classes (zhenggen-xu#82)
zhenggen-xu pushed a commit that referenced this pull request Dec 15, 2020
@nazariig
[submodule]: Advance sonic-platform-common. (sonic-net#4513)
2153cae 
Commits on Mar 20, 2020
SFP(sff8472 attributes) transciever eeprom attribute support. (#74) 9b1dea5

Commits on Mar 22, 2020
Detect an SFP adapter in a QSFP port, and instantiate an SFP object i… 116eeec

Commits on Apr 13, 2020
[component]: Introduce new firmware management API. 2632a59

Commits on Apr 16, 2020
[Chassis base] Add sfp error event definition (#80) f1f00ec

Commits on Apr 24, 2020
[component]: Update firmware management API. 777901f
[component]: Extend docstrings for firmware management API. b066ec7

Commits on Apr 30, 2020
[component]: Fix review comments. d96344e
Merge pull request #82 from nazariig/master-component-firmware-api 28c39c5 

Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>
zhenggen-xu pushed a commit that referenced this pull request May 24, 2024
@mssonicbld
[submodule] Update submodule sonic-host-services to the latest HEAD a…
b40cb1f 
…utomatically (sonic-net#17229)

#### Why I did it
src/sonic-host-services
```
* 689395a - (HEAD -> 202305, origin/202305) Updated the iptable rule to use parent/base name of midplane interface of chassis. (#75) (2 days ago) [abdosi]
* 45212a8 - [DualToR][caclmgrd] Fix IPtables rules for multiple vlan interfaces for DualToR config (#82) (2 days ago) [vdahiya12]
```
#### 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
Reviewers

@zhenggen-xu zhenggen-xu zhenggen-xu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@praveen-li @zhenggen-xu