Skip to content

Merge master to develop #462

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
Merged
merged 42 commits into from
Sep 23, 2019
Merged

Merge master to develop #462

merged 42 commits into from
Sep 23, 2019

Conversation

KevinBKozan
Copy link
Contributor

@KevinBKozan KevinBKozan commented Sep 19, 2019 •
edited
Loading

Description

Contents from:

  • 2.4.5
  • 2.5.0

dobooth and others added 30 commits August 13, 2019 16:19
@dobooth
Adding action group ref file.
44159b5
@dobooth
Small grammar change.
5895db4
@dobooth
moving template to devdocs.
17fea8e
@KevinBKozan
Merge pull request #419 from magento-devdocs/db_actiongroup_ref
8e2fa00 
Adding action group ref file.
@dobooth
Putting selectors.md back
f5e0799
@KevinBKozan
Merge pull request #423 from magento-devdocs/db_selectors
c608c2c 
Putting selectors.md back
@KevinBKozan
MQE-1715: .credentials file must exist but it should not have to
3bf88ed 
- Added try/catch logic to problem area.
@KevinBKozan
MQE-1715: .credentials file must exist but it should not have to
9015ee9 
- composer and lock file update
- changelog update
@okolesnyk
Merge pull request #438 from magento/MQE-1715
d9de524 
MQE-1715: .credentials file must exist but it should not have to
@KevinBKozan
MQE-1510 (#446)
7222259
@soumyau
MQE-1755: mftf run:test Test1 Test2 does not run before/after hooks c…
fa579d1 
…orrectly
@soumyau
MQE-1755: mftf run:test Test1 Test2 does not run before/after hooks c…
3b84f12 
…orrectly

fixed unit tests
@soumyau
MQE-1755: mftf run:test Test1 Test2 does not run before/after hooks c…
8597fcb 
…orrectly

fix unit tests
@jilu1
Merge pull request #447 from magento/MQE-1753
fb444bd 
MQE-1753: Uncaught ArgumentCountError when running bin/mftf static-ch…
@soumyau
MQE-1755: mftf run:test Test1 Test2 does not run before/after hooks c…
9cfeb9c 
…orrectly
@soumyau
MQE-1755: mftf run:test Test1 Test2 does not run before/after hooks c…
6a5798e 
…orrectly

fixed unit test failures
@soumyau
Merge pull request #448 from magento/MQE-1755
88030f3 
MQE-1755: mftf run:test Test1 Test2 does not run before/after hooks c…
@jilu1
Merge pull request #451 from magento/MQE-1754
55a8dda 
Mqe 1754
@KevinBKozan
MQE-1743: Changelog and Composer Bump (#449)
c113b9f 
- CHANGELOG update
- Version bump
@KevinBKozan
MQE-1582: Enable Testers To Run Skipped Tests
d97b013 
- Fix tag name to allow-skipped as per AC
@KevinBKozan
Merge pull request #452 from magento/MQE-1582
eca4dbc 
MQE-1582: Enable Testers To Run Skipped Tests
@KevinBKozan
MQE-1765: Introduce API Endpoint and Request Headers to Allure artifacts
f63fac8 
- Removed both artifacts to be reintroduced later.
@KevinBKozan
MQE-1765: Introduce API Endpoint and Request Headers to Allure artifacts
93fd35d 
- Changelog redaction
@KevinBKozan
Merge pull request #454 from magento/Remove-Artifacts
d3c7759 
MQE-1765: Introduce API Endpoint and Request Headers to Allure artifacts
@jilu1
MQE-1671: updated CHANGELOG.md to include vault integration
7accc4c
@KevinBKozan
Merge pull request #456 from magento/MQE-1671
73fbfa5 
MQE-1671: updated CHANGELOG.md to include vault integration
@jilu1
MQE-1768: incorrect credential key for carriers_fedex_account in .cre…
d58eb6b 
…dentials.example
@KevinBKozan
Merge pull request #457 from magento/MQE-1768
2c4f210 
MQE-1768: incorrect credential key for carriers_fedex_account in .cre…
@KevinBKozan
Merge branch 'master' into 2.5.0-RC
007c83c
@KevinBKozan
Merge pull request #458 from magento/2.5.0-RC
5aa3796 
MFTF 2.5.0
@coveralls
Copy link

coveralls commented Sep 19, 2019 •
edited
Loading

Coverage Status

Coverage increased (+0.03%) to 52.121% when pulling e447ac0 on MasterToDevelop into e850699 on develop.

jilu1
jilu1 approved these changes Sep 19, 2019
View reviewed changes
Copy link
Contributor

@jilu1 jilu1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks correct to me

@KevinBKozan KevinBKozan merged commit 17082a1 into develop Sep 23, 2019
@KevinBKozan KevinBKozan deleted the MasterToDevelop branch September 23, 2019 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jilu1 jilu1 jilu1 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@KevinBKozan @coveralls @jilu1 @dobooth @okolesnyk @soumyau