diff options
| author | Daniel Gottlieb <daniel.gottlieb@mongodb.com> | 2020-08-05 16:33:28 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-05 20:45:53 +0000 |
| commit | 6da20f433cc8a6ae47664f89085ee8873817d651 (patch) | |
| tree | a84237cb6dbf30e12d2a2c16058ab9710a9cba04 | |
| parent | 9a4be902441496be7ef40e5404a91ac30dc81f77 (diff) | |
| download | mongo-6da20f433cc8a6ae47664f89085ee8873817d651.tar.gz | |
SERVER-47509: Correct merge conflict resoluation
| -rw-r--r-- | etc/evergreen.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 3e7765c6344..ba26875a801 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -11857,7 +11857,7 @@ buildvariants: # correctly after rollbackViaRefetch. test_flags: >- --storageEngine=ephemeralForTest - --excludeWithAnyTags=requires_persistence,requires_fsync,SERVER-21420,SERVER-21658,requires_journaling,requires_wiredtiger,uses_transactions,requires_document_locking,uses_speculative_majority,requires_snapshot_read,requires_majority_read_concern,uses_change_streams,requires_sharding,incompatible_with_eft + --excludeWithAnyTags=requires_persistence,requires_fsync,SERVER-21420,SERVER-21658,requires_journaling,requires_wiredtiger,uses_transactions,uses_speculative_majority,requires_snapshot_read,requires_majority_read_concern,uses_change_streams,requires_sharding,incompatible_with_eft --mongodSetParameters="{oplogApplicationEnforcesSteadyStateConstraints: false}" compile_flags: -j$(grep -c ^processor /proc/cpuinfo) --dbg=off --opt=on --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars multiversion_platform: rhel62 |