API/DEPR: replace "raise_conflict" with "errors" for df.update#23657

Merged

jreback merged 6 commits intopandas-dev:masterfrom

h-vetinari:depr_raise_conflict

Nov 15, 2018

Commits on Nov 12, 2018

API/DEPR: replace "raise_conflict" with "errors" for df.update
h-vetinari
committed

Commits on Nov 15, 2018

Restart CI after timeout
h-vetinari
committed