Skip to content

[stable10] fix diff between master and stable10 in Auth tests#35548

Merged
individual-it merged 1 commit into
stable10from
stable10-fixAuthTestDiff
Jun 17, 2019
Merged

[stable10] fix diff between master and stable10 in Auth tests#35548
individual-it merged 1 commit into
stable10from
stable10-fixAuthTestDiff

Conversation

@individual-it

@individual-it individual-it commented Jun 17, 2019

Copy link
Copy Markdown
Member

Description

in 3dabf04 tests were copied to new files, but not deleted from the old one
compare master commit where it happened correctly 13625fe

that resulted in conflicts for #35472

CC @bhawanaprasain

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • Backport (if applicable set "backport-request" label and remove when the backport was done)

@individual-it
individual-it merged commit 7a19d55 into stable10 Jun 17, 2019
@delete-merged-branch
delete-merged-branch Bot deleted the stable10-fixAuthTestDiff branch June 17, 2019 07:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants