diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-05-11 10:15:43 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-05-11 10:15:43 +0200 |
| commit | 44d6d3f913c61d09226238f37d61feb52833d5ed (patch) | |
| tree | dbcf5262ba04679ac2a3389a5b82916dfe6e7a33 /erts | |
| parent | 6f90e6174a904085d7fab1851d16d853cdfd8824 (diff) | |
| parent | 241eab82ad76d68dbef3efdb4066d14b82fd0234 (diff) | |
| download | otp-44d6d3f913c61d09226238f37d61feb52833d5ed.tar.gz otp-44d6d3f913c61d09226238f37d61feb52833d5ed.tar.bz2 otp-44d6d3f913c61d09226238f37d61feb52833d5ed.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
The channel id in a channel failure message, sent to the peer, is now in all cases the remote channel id
Improved explanation of depth option
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions