Closed greg-1-anderson closed 2 years ago
+1
Yeah I have to either merge my test change into the default branch, or just back it out and merge this with failing tests.
I force-pushed the test changes from this branch onto the default branch, which took care of the merge conflict here.
If we want to get rid of these test modifications later, we could cherry-pick 9e9928a3b onto default later (after hard-reseting default to get rid of the "CircleCI 2.0 tests" commit that's there right now).
For details, see https://pantheon.io/docs/pantheon-yml#specify-a-version-of-mariadb
See also pantheon-systems/documentation#6928, which modifies that section.