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.

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

merge with master #1

Merged
merged 28 commits into from
Apr 8, 2018
Merged

merge with master #1

merged 28 commits into from
Apr 8, 2018

Conversation

simonJi2018
Copy link
Owner

- What I did

- How I did it

- How to verify it

- Description for the changelog

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

Volodymyr Samotiy and others added 28 commits March 26, 2018 10:15
Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>
Enforce SMBus retry for all kinds of IO error as they are generally
one off errors.
Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>
* SONiC system telemetry Support

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>

* Update package name from telemetry to sonic-telemetry

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
* [submodules]: update swss and sairedis

Signed-off-by: Guohan Lu <gulv@microsoft.com>
…e.conf (#1552)

Signed-off-by: Guohan Lu <gulv@microsoft.com>
cfggen generates new eth0 configuration. Need to first
clean existing configuration on eth0 before bring up
new configuration on eth0. Thus, we need to first bring
down eth0 before putting new configuration into /etc/network/
interfaces

Signed-off-by: Guohan Lu <gulv@microsoft.com>
* [minigraph.py] Add support to parse tacacs server information
Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>
* Upgrade SAI to v1.2.4

* Add a new supported device accton as7116

* Add maintainer info for deb
…iner to support mellanox sdk and prm sniffer. (#1551)

modified:   files/build_templates/docker_image_ctl.j2

  Signed-off-by:  Kebo Liu kebol@mellanox.com
…if date is not correctly set (#1560)

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
…future, if date is not correctly set (#1560)" (#1561)

This reverts commit 0996356.
…if date is not correctly set (#1562)

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
- Includes the following commits:
    - [bcmshell.py] Match extra whitespace before prompt in regex (#3)
    - add support for qsfp28 eeprom (#2)
* Set MAC address of mangement port in initramfs

* Fix boot0 for running in none-aboot environment
Signed-off-by: Guohan Lu <gulv@microsoft.com>
Signed-off-by: Guohan Lu <gulv@microsoft.com>
@simonJi2018 simonJi2018 self-assigned this Apr 8, 2018
@simonJi2018 simonJi2018 merged commit 72d9dfd into simonJi2018:master Apr 8, 2018
simonJi2018 pushed a commit that referenced this pull request May 14, 2019
…c-net#2832)

* Base DHCP relay Docker image on Strech base Docker

* Change URL for isc-dhcp source repository

* Upgrade isc-dhcp source branch to 4.3.5-3.1

* Update patch #1 to apply to isc-dhcp 4.3.5-3.1

* Update patch #2 to apply to isc-dhcp 4.3.5-3.1

* Update patch #3 to apply to isc-dhcp 4.3.5-3.1

* Update patch #4 to apply to isc-dhcp 4.3.5-3.1

* Remove security patches, as they are now applied as part of 4.3.5-3.1 source

* Reorder patches to apply bug fix first, then features

* Extend makefile to build debug Docker image

* Update commit that series file applies against
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.