upgrade SAI to v1.4 for 201811 #3088
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
qiluo-msft
reviewed
Jun 26, 2019
qiluo-msft
changed the title
|
could you resolve the conflicts? |
sonic-swss * 32d3297 2019-01-24 | use sai_stat_id_t for new SAI header file (sonic-net#769) sonic-sairedis * fdfcefd 2019-04-24 | [SAI] Advance submodule to v1.4.1 (sonic-net#450) (HEAD -> 201811, origin/201811) [Marian Pritsak] * 006df41 2019-02-27 | [vslib]: Add support of bitmap VNET (bmtor) SAI API (sonic-net#424) [Volodymyr Samotiy] * ec5e187 2019-04-23 | [SAI]: Move SAI pointer to v1.4 (sonic-net#447) [Shuotian Cheng] * 6b9c32e 2019-03-04 | [SAI] Update SAI pointer (sonic-net#431) [Stepan Blyshchak] * f078998 2019-02-22 | Fix compilation issues in stretch docker with gcc-6.3 (sonic-net#426) [Stepan Blyshchak] * 0540e59 2019-01-31 | Update SAI pointer (sonic-net#414) [Marian Pritsak] * 9084920 2019-01-18 | Update SAI pointer to latest master (sonic-net#408) [Marian Pritsak] * fbfe48b 2019-06-24 | Revert "[SAI header] upgrade SAI header to version v1.3.7 (sonic-net#445)" [Guohan Lu] Signed-off-by: Guohan Lu <gulv@microsoft.com>
Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>
|
resolved. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- What I did
need upload mellanox sdk and sai- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)