wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

missed a conflict

This commit is contained in:
Evan Tschannen 2020-09-24 17:20:02 -07:00
parent 2d788b309f
commit 4042e9c52f
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flow/error_definitions.h
View File

@ -141,11 +141,8 @@ ERROR( no_commit_version, 2021, "Transaction is read-only and therefore does not
ERROR( environment_variable_network_option_failed, 2022, "Environment variable network option could not be set" )
ERROR( transaction_read_only, 2023, "Attempted to commit a transaction specified as read-only" )
ERROR( invalid_cache_eviction_policy, 2024, "Invalid cache eviction policy, only random and lru are supported" )
<<<<<<< HEAD
ERROR( network_cannot_be_restarted, 2025, "Network can only be started once" )
=======
ERROR( blocked_from_network_thread, 2026, "Detected a deadlock in a callback called from the network thread" )
>>>>>>> release-6.2
ERROR( incompatible_protocol_version, 2100, "Incompatible protocol version" )
ERROR( transaction_too_large, 2101, "Transaction exceeds byte limit" )