diff options
| author | Dan Gudmundsson <[email protected]> | 2016-02-12 08:43:05 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-02-12 08:43:05 +0100 |
| commit | cf99bf2de73be06e0f0d597dc72e3d7df1ed5f90 (patch) | |
| tree | c276d6c6dc576d89785991ace2f06ab060dbf901 /lib/mnesia/src/mnesia_monitor.erl | |
| parent | d7b8fad1dcd08c1a9a94952f45bd63dc39159be2 (diff) | |
| parent | e84414ce53c7a1131c2356e81b5417badb1389c8 (diff) | |
| download | otp-cf99bf2de73be06e0f0d597dc72e3d7df1ed5f90.tar.gz otp-cf99bf2de73be06e0f0d597dc72e3d7df1ed5f90.tar.bz2 otp-cf99bf2de73be06e0f0d597dc72e3d7df1ed5f90.zip | |
Merge branch 'maint'
* maint:
mnesia: let loader check if tablelock is needed
mnesia: Avoid deadlock possibility in mnesia:del_table_copy schema
Diffstat (limited to 'lib/mnesia/src/mnesia_monitor.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_monitor.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl index 8313c3bda5..081d746257 100644 --- a/lib/mnesia/src/mnesia_monitor.erl +++ b/lib/mnesia/src/mnesia_monitor.erl @@ -82,9 +82,9 @@ going_down = [], tm_started = false, early_connects = [], connecting, mq = [], remote_node_status = []}). --define(current_protocol_version, {8,1}). +-define(current_protocol_version, {8,2}). --define(previous_protocol_version, {8,0}). +-define(previous_protocol_version, {8,1}). start() -> gen_server:start_link({local, ?MODULE}, ?MODULE, @@ -193,7 +193,7 @@ protocol_version() -> %% A sorted list of acceptable protocols the %% preferred protocols are first in the list acceptable_protocol_versions() -> - [protocol_version(), ?previous_protocol_version, {7,6}]. + [protocol_version(), ?previous_protocol_version]. needs_protocol_conversion(Node) -> case {?catch_val({protocol, Node}), protocol_version()} of @@ -424,8 +424,6 @@ handle_call({negotiate_protocol, Mon, Version, Protocols}, From, State) case hd(Protocols) of ?previous_protocol_version -> accept_protocol(Mon, MyVersion, ?previous_protocol_version, From, State); - {7,6} -> - accept_protocol(Mon, MyVersion, {7,6}, From, State); _ -> verbose("Connection with ~p rejected. " "version = ~p, protocols = ~p, " |