diff options
| author | Dan Gudmundsson <dgud@erlang.org> | 2017-11-30 12:10:02 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <dgud@erlang.org> | 2017-11-30 12:10:02 +0100 |
| commit | 5033b579c012abb52d4bdcca34f0d8f3a678cb22 (patch) | |
| tree | 6f874c422241a6cfb08e237965db0c9072425371 /lib/mnesia | |
| parent | 6fb6f4222f2cf924cbb9174d33c3b3190cfe52f2 (diff) | |
| parent | 35266110ade3b34b879327e5bc4bbd2d367e305a (diff) | |
| download | erlang-5033b579c012abb52d4bdcca34f0d8f3a678cb22.tar.gz | |
Merge branch 'maint'
* maint:
Fix type create_option() in mnesia
Diffstat (limited to 'lib/mnesia')
| -rw-r--r-- | lib/mnesia/src/mnesia.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/mnesia/src/mnesia.erl b/lib/mnesia/src/mnesia.erl index 190fb2b56d..95f7d4afc1 100644 --- a/lib/mnesia/src/mnesia.erl +++ b/lib/mnesia/src/mnesia.erl @@ -151,7 +151,8 @@ {'snmp', SnmpStruct::term()} | {'storage_properties', [{Backend::module(), [BackendProp::_]}]} | {'type', 'set' | 'ordered_set' | 'bag'} | - {'local_content', boolean()}. + {'local_content', boolean()} | + {'user_properties', proplists:proplist()}. -type t_result(Res) :: {'atomic', Res} | {'aborted', Reason::term()}. -type activity() :: 'ets' | 'async_dirty' | 'sync_dirty' | 'transaction' | 'sync_transaction' | |