Skip to content

[pull] master from Azure:master #2

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

Merged
pull merged 8 commits into from
Apr 5, 2019
Merged

[pull] master from Azure:master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a1c3c06
Install ipaddress python package that has deprecated current ipaddr. …
renukamanavalan Mar 15, 2019
c701194
Install python ipaddress module as required by route_check.py sonic u…
renukamanavalan Mar 15, 2019
3906da0
Revert the old chaneg per review comments.
renukamanavalan Mar 15, 2019
e73f86d
Merge remote-tracking branch 'upstream/master'
renukamanavalan Apr 1, 2019
e65d9c5
Merge remote-tracking branch 'upstream/master'
renukamanavalan Apr 3, 2019
6d7ecc4
[hostcfgd] -- Fix the default for failthrough as false.
renukamanavalan Apr 3, 2019
f3afaea
Merge pull request #2746 from renukamanavalan/master
renukamanavalan Apr 5, 2019
69ef456
[swss]: Update to debian python-scapy (2.4.2) to fix scapy crash seen…
jipanyang Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions dockers/docker-orchagent/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ RUN apt-get update

RUN apt-get install -f -y ifupdown arping libdbus-1-3 libdaemon0 libjansson4 libpython2.7 iproute2

RUN apt-get install -f -y ndisc6 tcpdump python-scapy
RUN apt-get install -f -y ndisc6 tcpdump
RUN pip install scapy==2.4.2
## Install redis-tools dependencies
## TODO: implicitly install dependencies
RUN apt-get -y install libjemalloc1

RUN apt-get install -y libelf1 libmnl0 bridge-utils

RUN pip install setuptools
RUN pip install setuptools
RUN pip install pyroute2==0.5.3 netifaces==0.10.7
RUN pip install monotonic==1.5

Expand Down
2 changes: 0 additions & 2 deletions files/image_config/hostcfgd/hostcfgd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ class AaaCfg(object):
def __init__(self):
self.auth_default = {
'login': 'local',
'failthrough': True,
'fallback': True
}
self.tacplus_global_default = {
'auth_type': TACPLUS_SERVER_AUTH_TYPE_DEFAULT,
Expand Down