diff options
| author | Anders Svensson <[email protected]> | 2013-03-18 19:29:23 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-03-18 19:29:23 +0100 |
| commit | 4ac5deb44293aa78ee53dae0e190733442a2c6c6 (patch) | |
| tree | 41296110ca32aef3c20291efa4d16c9dd9e1b9d3 /lib/diameter/src/base/diameter.erl | |
| parent | 887577cfaeee55461f1e8f7b4f9472cbca1d2a2e (diff) | |
| parent | ecebd37eb5e874e307812373c072f685455a2eee (diff) | |
| download | otp-4ac5deb44293aa78ee53dae0e190733442a2c6c6.tar.gz otp-4ac5deb44293aa78ee53dae0e190733442a2c6c6.tar.bz2 otp-4ac5deb44293aa78ee53dae0e190733442a2c6c6.zip | |
Merge branch 'anders/diameter/distribution/OTP-9610' into maint
* anders/diameter/distribution/OTP-9610:
Specify timeouts to ct_slave:start/2
More flexible distribution config
Add distribution suite
Document distribution config
Distribution fixes
Diffstat (limited to 'lib/diameter/src/base/diameter.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl index c67fba5f89..189f2b01b9 100644 --- a/lib/diameter/src/base/diameter.erl +++ b/lib/diameter/src/base/diameter.erl @@ -45,6 +45,7 @@ -export_type([evaluable/0, restriction/0, + remotes/0, sequence/0, app_alias/0, service_name/0, @@ -292,13 +293,20 @@ call(SvcName, App, Message) -> | [node()] | evaluable(). +-type remotes() + :: boolean() + | [node()] + | evaluable(). + %% Options passed to start_service/2 -type service_opt() :: capability() | {application, [application_opt()]} | {restrict_connections, restriction()} - | {sequence, sequence() | evaluable()}. + | {sequence, sequence() | evaluable()} + | {share_peers, remotes()} + | {use_shared_peers, remotes()}. -type application_opt() :: {alias, app_alias()} |