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.

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

Jump to bottom

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

Merged
merged 6 commits into from
Nov 15, 2018
Merged

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

merged 6 commits into from
Nov 15, 2018

Commits on Nov 12, 2018

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

    @h-vetinari
    h-vetinari committed Nov 12, 2018
    Configuration menu
    Copy the full SHA
    5a96841 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2018

  1. Merge remote-tracking branch 'upstream/master' into depr_raise_conflict

    @h-vetinari
    h-vetinari committed Nov 14, 2018
    Configuration menu
    Copy the full SHA
    22ee9d7 View commit details
    Browse the repository at this point in the history

  2. Review (jreback)

    @h-vetinari
    h-vetinari committed Nov 14, 2018
    Configuration menu
    Copy the full SHA
    8f9ee07 View commit details
    Browse the repository at this point in the history

  3. Adapt Panel tests as well; lint

    @h-vetinari
    h-vetinari committed Nov 14, 2018
    Configuration menu
    Copy the full SHA
    067c4f2 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into depr_raise_conflict

    @h-vetinari
    h-vetinari committed Nov 14, 2018
    Configuration menu
    Copy the full SHA
    ba9490e View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2018

  1. Restart CI after timeout

    @h-vetinari
    h-vetinari committed Nov 15, 2018
    Configuration menu
    Copy the full SHA
    5ff6261 View commit details
    Browse the repository at this point in the history