diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-07-30 00:17:32 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-07-30 00:17:32 +0300 |
| commit | 2ccc749a28a643e5020a769d48b950d17d0fda56 (patch) | |
| tree | ee7906a35aac0f9e3430c862405e202f0c52c514 /src | |
| parent | 0af2c6d3875a00fed6c6090ebd39fe2b82395411 (diff) | |
| parent | cdca66bebd89d27b616c94e514e674cb9f3f364c (diff) | |
| download | rabbitmq-server-git-2ccc749a28a643e5020a769d48b950d17d0fda56.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mnesia.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 26a864f0f5..596eb62b03 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -58,7 +58,7 @@ %% Main interface -spec init() -> 'ok'. -spec join_cluster(node(), node_type()) - -> 'ok' | {'ok', 'already_member'}. + -> ok | {ok, already_member} | {error, {inconsistent_cluster, string()}}. -spec reset() -> 'ok'. -spec force_reset() -> 'ok'. -spec update_cluster_nodes(node()) -> 'ok'. |