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

Changes from develop branch #140

Merged
merged 45 commits into from
Jan 12, 2018
Merged

Changes from develop branch #140

merged 45 commits into from
Jan 12, 2018

Conversation

oshmyheliuk
Copy link
Contributor

Description

Fixed Issues (if relevant)

  1. ...
  2. ...

Zephyr Tests

  1. ...

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • Pull request was approved by architect
  • Pull request was approved by QA member
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

Billy Gilbert and others added 30 commits November 30, 2017 16:07
Resolving conflicts from 736
3c79e42
Merge remote-tracking branch 'main/develop' into MAGECLOUD-736-CF
2b2fdee
Adding try/catch to file calls and appropriate unit tests
6880e7f
@billygilbert
Merge branch 'develop' into MAGECLOUD-736
55be38f
@billygilbert
Merge branch 'develop' into MAGECLOUD-736
3dccfc2
Adding logger to DirectoryCopier classes, increasing Unit test coverage
d40aeea
Merge branch 'MAGECLOUD-736' of github.com:magento-cloud/ece-tools in…
3c15f09 
…to MAGECLOUD-736-CF
Incorporating feedback from code review
f84d605
Fixing incompatability issues with interface
128ec4a
Further refactoring from code review
ec57173
Testing removing verbose commands to see if build finishes
8fdecca
Better usage of constants for flag names
bebb011
@shiftedreality
MAGECLOUD-1253: [GitHub][PR] Provide the user a way to see the instal…
383f803 
…l progress #74 (#107)
Merging latest Develop into 736
93588b2
@oshmyheliuk
MAGECLOUD-1389: Command "ece-tools deploy" running in interaction mode
38b2981
Creating Prestart generate class to read locales from DB
47a9c55
@shiftedreality
Merge pull request #116 from magento-thunder/MAGECLOUD-1389
4a4d8d7 
MAGECLOUD-1389: Command "ece-tools deploy" running in interaction mode
@oshmyheliuk @shiftedreality
MAGECLOUD-1162: [GitHub] Deleting var/log while still writing to var/…
d613e20 
…log/cloud.log (#113)
@shiftedreality
MAGECLOUD-1372: Backup Critical Configuration Files to Recover On-Dem…
6fc653a 
…and (#115)
@shiftedreality
MAGECLOUD-1413: Gzip fails with exception when directory on file name…
1557d96 
… contains spaces (#118)
@oshmyheliuk @shiftedreality
MAGECLOUD-1410: Merchants are unable to use their own AMQP & Search s…
58aa473 
…ervers (#117)
@shiftedreality
Merge branches '2002.0' and 'develop' of https://github.com/magento/e…
3b13a7e 
…ce-tools into develop
Adding logic to delete link if one is passed in backgroundClearDirectory
3320919
@billygilbert
Merge pull request #8 from magento-cloud/MAGECLOUD-736-DB
462ce25 
Query DB for locales for SCD in Prestart
Merging in latest develop
2914c3b
Adding prestart to UpgradeTest
7ee9f3a
Missed a use statement
d990be5
@billygilbert
Merge pull request #88 from magento-cloud/MAGECLOUD-736
9df683e 
MAGECLOUD-736: Adds prestart command for local SCD
@shiftedreality
Merge pull request #121 from magento/2002.0
ef0fea9 
MAGECLOUD-1424: Re-factor automatic module enabling (#120)
@shiftedreality
MAGECLOUD-1386: Introduce resolver mechanism for unified configs (#114)
5478a11
shiftedreality and others added 14 commits December 19, 2017 12:47
@shiftedreality
MAGECLOUD-1342: Add RepositoryFactory class to create repositories fr…
9cc0bdb 
…om raw config (#104)
@NadiyaS
MAGECLOUD-1446: Deploy static content in compact strategy shouldn't u…
0b1508c 
…se process-per-locale
@shiftedreality
Merge pull request #129 from magento/2002.0
0f3bfcc 
Merge 2002.0 into develop
@shiftedreality
MAGECLOUD-1401: Move log resolving to Logger class instead of deploy …
4472d57 
…preprocess (#124)
@shiftedreality
Merge pull request #126 from magento-thunder/MAGECLOUD-1446
5c48630 
MAGECLOUD-1446: Deploy static content in compact strategy shouldn't use process-per-locale
@shiftedreality
MAGECLOUD-1452: Eliminate bootstrap class (#125)
ae6826f
@oshmyheliuk @shiftedreality
MAGECLOUD-1367: Improve cron:unlock Command (#133)
477ab92
@shiftedreality
MAGECLOUD-1369: Unified environment configs (#132)
3a8a3e6
@oshmyheliuk @shiftedreality
MAGECLOUD-1444: Refactor Flag Files (#123)
39d89a1
@oshmyheliuk
MAGECLOUD-1495: Add Proper Logging for Variables Overrides
7a15b78
@shiftedreality
Merge pull request #135 from magento-thunder/MAGECLOUD-1495
5b40a62 
MAGECLOUD-1495: Add Proper Logging for Variables Overrides
@oshmyheliuk
MAGECLOUD-1520: Initial builds failing (#137)
11d3b5f 
* MAGECLOUD-1520: Initial builds failing

* MAGECLOUD-1520: Initial builds failing

* MAGECLOUD-1520: Initial builds failing

* MAGECLOUD-1520: Initial builds failing

* MAGECLOUD-1520: Initial builds failing
@oshmyheliuk
MAGECLOUD-1493: URL Update Flow is Working not as Expected (#138)
25d6cc5
MAGECLOUD-1485: Deploy static content in compact strategy shouldn't u…
a322b06 
…se process-per-locale for pre-start hook (#139)
@oshmyheliuk oshmyheliuk merged commit a7aa6bd into magento:2002.0 Jan 12, 2018
@oshmyheliuk oshmyheliuk deleted the 2002.0-11.01.18 branch January 12, 2018 09:55
@YPyltiai YPyltiai added Progress: accept PR/issue status and removed Progress: accept PR/issue status labels May 1, 2019
magento-devops-reposync-svc pushed a commit that referenced this pull request Apr 24, 2024
@tomreece
Merge pull request #140 from magento-commerce/develop-2002.1.18
246422b 
Merge 2002.1.18 into develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BaDos BaDos BaDos approved these changes

@shiftedreality shiftedreality Awaiting requested review from shiftedreality

@magearhiopterecs magearhiopterecs Awaiting requested review from magearhiopterecs

@NadiyaS NadiyaS Awaiting requested review from NadiyaS

Assignees

@BaDos BaDos

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@oshmyheliuk @BaDos @YPyltiai @billygilbert @shiftedreality @NadiyaS