summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rickard/time_api/OTP-11997'Rickard Green2015-03-2420-398/+1102
|\
| * Better OS system time implementationRickard Green2015-03-2414-134/+507
| * Documentation adjustmentsRickard Green2015-03-242-13/+49
| * Fix zero timout timersRickard Green2015-03-241-0/+1
| * erts_sys_hrtime() for lcntRickard Green2015-03-237-29/+131
| * Better support for poor os monotonic sourcesRickard Green2015-03-2311-249/+441
* | Merge branch 'maint'Anders Svensson2015-03-243-8/+56
|\ \
| * \ Merge branch 'anders/diameter/17.5/OTP-12435' into maintAnders Svensson2015-03-243-8/+56
| |\ \
| | * | vsn -> 1.9Anders Svensson2015-03-241-4/+2
| | * | Update appup for 17.5Anders Svensson2015-03-241-3/+53
| | * | Minor doc fixAnders Svensson2015-03-241-1/+1
| |/ /
* | | Merge branch 'maint'Anders Svensson2015-03-2419-250/+726
|\ \ \ | |/ /
| * | Merge branch 'anders/diameter/dpr/OTP-12609' into maintAnders Svensson2015-03-245-22/+96
| |\ \
| | * | Discard incoming/outgoing requests after incoming DPRAnders Svensson2015-03-231-10/+28
| | * | Add transport_opt() dpr_timeoutAnders Svensson2015-03-235-11/+52
| | * | Be lenient with errors in incoming DPRAnders Svensson2015-03-231-2/+17
| * | | Merge branch 'anders/diameter/DiameterURI/OTP-12589' into maintAnders Svensson2015-03-246-13/+81
| |\ \ \
| | * | | Adapt to changed DiameterURI defaults in RFC 6733Anders Svensson2015-03-245-14/+70
| | * | | Reject transport=udp;protocol=diameter at DiameterURI encodeAnders Svensson2015-03-242-3/+15
| |/ / /
| * | | Merge branch 'anders/diameter/string_decode/OTP-11952' into maintAnders Svensson2015-03-2418-216/+526
| |\ \ \
| | * | | Let examples override default service optionsAnders Svensson2015-03-243-3/+38
| | * | | Set {restrict_connections, false} in example serverAnders Svensson2015-03-241-0/+1
| | * | | Set {string_decode, false} in examplesAnders Svensson2015-03-243-0/+3
| | * | | Test {string_decode, false} in traffic suiteAnders Svensson2015-03-241-59/+136
| | * | | Add service_opt() string_decodeAnders Svensson2015-03-2413-130/+303
| | * | | Strip potentially large terms when sending outgoing Diameter messagesAnders Svensson2015-03-233-11/+33
| | * | | Improve language consistency in diameter(1)Anders Svensson2015-03-191-14/+13
| * | | | Merge branch 'anders/diameter/route_record/OTP-12551' into maintAnders Svensson2015-03-242-9/+33
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix ordering of AVPs in relayed messagesAnders Svensson2015-03-232-9/+33
* | | | | Merge branch 'maint'Anders Svensson2015-03-238-46/+196
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'anders/diameter/dpr/OTP-12542' into maintAnders Svensson2015-03-238-43/+159
| |\ \ \ \
| | * | | | Discard CER or DWR sent with diameter:call/4Anders Svensson2015-03-221-0/+10
| | * | | | Allow DPR to be sent with diameter:call/4Anders Svensson2015-03-222-29/+89
| | * | | | Add transport_opt() dpa_timeoutAnders Svensson2015-03-227-9/+37
| | * | | | Add testcase for sending DPR with diameter:call/4Anders Svensson2015-03-221-10/+28
| * | | | | Merge branch 'anders/diameter/dpr/OTP-12543' into maintAnders Svensson2015-03-231-8/+42
| |\ \ \ \ \ | | |/ / / /
| | * | | | Discard incoming requests after outgoing DPRAnders Svensson2015-03-221-5/+18
| | * | | | Discard outgoing requests after outgoing DPRAnders Svensson2015-03-221-3/+24
| | |/ / /
* | | | | Merge branch 'maint'Erland Schönbeck2015-03-233-40/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'erland/revert_time/OTP-12444' into maintErland Schönbeck2015-03-233-38/+12
| |\ \ \ \
| | * | | | Revert "Use new time API and be back-compatible in ssh"Erland Schönbeck2015-03-163-38/+12
* | | | | | Merge branch 'ia/ssl/dialyzer/alpn-and-crl'Ingela Anderton Andin2015-03-233-14/+17
|\ \ \ \ \ \
| * | | | | | ssl: Dialyzer fixesIngela Anderton Andin2015-03-233-14/+17
* | | | | | | Merge branch 'maint'Anders Svensson2015-03-224-15/+38
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'anders/diameter/17/time/OTP-12439' into maintAnders Svensson2015-03-221-3/+6
| |\ \ \ \ \ \
| | * | | | | | Adapt app suite to changes in time apiAnders Svensson2015-03-191-3/+6
| * | | | | | | Merge branch 'anders/diameter/time/OTP-12439' into maintAnders Svensson2015-03-221-9/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Adapt to changes in time apiAnders Svensson2015-03-191-9/+6
| * | | | | | | | Merge branch 'nox/fix-port_info-race' into maintZandra Hird2015-03-202-3/+26
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix a race condition when calling port_info/1Anthony Ramine2015-03-182-3/+26