OSDN Git Service

Merge changes I3b881be8,I80d97bd5,Id115e8b2
authorLorenzo Colitti <lorenzo@google.com>
Wed, 27 Jan 2016 05:54:24 +0000 (05:54 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 27 Jan 2016 05:54:24 +0000 (05:54 +0000)
commitb764f45fd9758c8222bc08d7fa4944e8f7da6f40
treef13a2c83e90f6069c966fe1afbfae294b0ef131d
parent1287f6e0afe146657a7d48167710947447e8693f
parent84d385b4d3491b072cdbea41d62127aa61c6f5e7
Merge changes I3b881be8,I80d97bd5,Id115e8b2

* changes:
  Fix lint warnings.
  Note a 3.18 commit in neighbour_test.py.
  SOCK_DESTROY is no longer optional.