Skip to content

Sync-up msft and fork#2

Closed
samaity wants to merge 6 commits intorodnymolina:masterfrom
sonic-net:master
Closed

Sync-up msft and fork#2
samaity wants to merge 6 commits intorodnymolina:masterfrom
sonic-net:master

Conversation

@samaity
Copy link

@samaity samaity commented Aug 22, 2017

No description provided.

zhenggen-xu and others added 6 commits August 16, 2017 21:12
#895)

* Adjusting FRR's jinja template to meet latest sonic-cfgen requirements. Basically, i'm just extending #448 changes into FRR.

    * Eliminate FRR's integrated-config file to prevent daemons from bypassing their own config files. FRR daemons now default to an integrated-config file for config-parsing purposes. But we are still interested in having each daemon looking in their specific config file (bgpd.conf, zebra.conf, etc). So here i'm just deleting this integrating-config file to prevent FRR from running from a bogus config-file.

RB=
G=lnos-reviewers
R=ntrianta,rjonnadu,rmolina,sfardeen,zxu
A=
* Adding Marvell platform.
@samaity samaity closed this Aug 22, 2017
rodnymolina pushed a commit that referenced this pull request Apr 17, 2018
- Includes the following commits:
    - [bcmshell.py] Match extra whitespace before prompt in regex (#3)
    - add support for qsfp28 eeprom (#2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants