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

Update emit event logic #654

Merged
merged 12 commits into from
Apr 10, 2020
Merged

Update emit event logic #654

merged 12 commits into from
Apr 10, 2020

Commits on Apr 3, 2020

  1. Configuration menu
    Copy the full SHA
    f5ee76d View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. Configuration menu
    Copy the full SHA
    1711df8 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into update-emit-event-logic

    # Conflicts:
    #	src/main/java/org/prebid/server/auction/BidResponseCreator.java
    #	src/main/java/org/prebid/server/auction/ExchangeService.java
    #	src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java
    #	src/test/java/org/prebid/server/auction/ExchangeServiceTest.java
    #	src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus/test-auction-rubicon-appnexus-response.json
    AndriyPavlyuk committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    981410f View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. Resolving conflicts

    AndriyPavlyuk committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    14de086 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into update-emit-event-logic

    # Conflicts:
    #	src/main/java/org/prebid/server/auction/ExchangeService.java
    #	src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus/test-auction-rubicon-appnexus-response.json
    AndriyPavlyuk committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    3cf5f75 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5a852a7 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2020

  1. Configuration menu
    Copy the full SHA
    ca5f298 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2227779 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ee3d3b5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    bd0e5ba View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2020

  1. Configuration menu
    Copy the full SHA
    edc1132 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bd30097 View commit details
    Browse the repository at this point in the history