Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rickard/time_api/OTP-11997' | Rickard Green | 2015-03-24 | 20 | -398/+1102 |
|\ | |||||
| * | Better OS system time implementation | Rickard Green | 2015-03-24 | 14 | -134/+507 |
| * | Documentation adjustments | Rickard Green | 2015-03-24 | 2 | -13/+49 |
| * | Fix zero timout timers | Rickard Green | 2015-03-24 | 1 | -0/+1 |
| * | erts_sys_hrtime() for lcnt | Rickard Green | 2015-03-23 | 7 | -29/+131 |
| * | Better support for poor os monotonic sources | Rickard Green | 2015-03-23 | 11 | -249/+441 |
* | | Merge branch 'maint' | Anders Svensson | 2015-03-24 | 3 | -8/+56 |
|\ \ | |||||
| * \ | Merge branch 'anders/diameter/17.5/OTP-12435' into maint | Anders Svensson | 2015-03-24 | 3 | -8/+56 |
| |\ \ | |||||
| | * | | vsn -> 1.9 | Anders Svensson | 2015-03-24 | 1 | -4/+2 |
| | * | | Update appup for 17.5 | Anders Svensson | 2015-03-24 | 1 | -3/+53 |
| | * | | Minor doc fix | Anders Svensson | 2015-03-24 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'maint' | Anders Svensson | 2015-03-24 | 19 | -250/+726 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'anders/diameter/dpr/OTP-12609' into maint | Anders Svensson | 2015-03-24 | 5 | -22/+96 |
| |\ \ | |||||
| | * | | Discard incoming/outgoing requests after incoming DPR | Anders Svensson | 2015-03-23 | 1 | -10/+28 |
| | * | | Add transport_opt() dpr_timeout | Anders Svensson | 2015-03-23 | 5 | -11/+52 |
| | * | | Be lenient with errors in incoming DPR | Anders Svensson | 2015-03-23 | 1 | -2/+17 |
| * | | | Merge branch 'anders/diameter/DiameterURI/OTP-12589' into maint | Anders Svensson | 2015-03-24 | 6 | -13/+81 |
| |\ \ \ | |||||
| | * | | | Adapt to changed DiameterURI defaults in RFC 6733 | Anders Svensson | 2015-03-24 | 5 | -14/+70 |
| | * | | | Reject transport=udp;protocol=diameter at DiameterURI encode | Anders Svensson | 2015-03-24 | 2 | -3/+15 |
| |/ / / | |||||
| * | | | Merge branch 'anders/diameter/string_decode/OTP-11952' into maint | Anders Svensson | 2015-03-24 | 18 | -216/+526 |
| |\ \ \ | |||||
| | * | | | Let examples override default service options | Anders Svensson | 2015-03-24 | 3 | -3/+38 |
| | * | | | Set {restrict_connections, false} in example server | Anders Svensson | 2015-03-24 | 1 | -0/+1 |
| | * | | | Set {string_decode, false} in examples | Anders Svensson | 2015-03-24 | 3 | -0/+3 |
| | * | | | Test {string_decode, false} in traffic suite | Anders Svensson | 2015-03-24 | 1 | -59/+136 |
| | * | | | Add service_opt() string_decode | Anders Svensson | 2015-03-24 | 13 | -130/+303 |
| | * | | | Strip potentially large terms when sending outgoing Diameter messages | Anders Svensson | 2015-03-23 | 3 | -11/+33 |
| | * | | | Improve language consistency in diameter(1) | Anders Svensson | 2015-03-19 | 1 | -14/+13 |
| * | | | | Merge branch 'anders/diameter/route_record/OTP-12551' into maint | Anders Svensson | 2015-03-24 | 2 | -9/+33 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Fix ordering of AVPs in relayed messages | Anders Svensson | 2015-03-23 | 2 | -9/+33 |
* | | | | | Merge branch 'maint' | Anders Svensson | 2015-03-23 | 8 | -46/+196 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'anders/diameter/dpr/OTP-12542' into maint | Anders Svensson | 2015-03-23 | 8 | -43/+159 |
| |\ \ \ \ | |||||
| | * | | | | Discard CER or DWR sent with diameter:call/4 | Anders Svensson | 2015-03-22 | 1 | -0/+10 |
| | * | | | | Allow DPR to be sent with diameter:call/4 | Anders Svensson | 2015-03-22 | 2 | -29/+89 |
| | * | | | | Add transport_opt() dpa_timeout | Anders Svensson | 2015-03-22 | 7 | -9/+37 |
| | * | | | | Add testcase for sending DPR with diameter:call/4 | Anders Svensson | 2015-03-22 | 1 | -10/+28 |
| * | | | | | Merge branch 'anders/diameter/dpr/OTP-12543' into maint | Anders Svensson | 2015-03-23 | 1 | -8/+42 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Discard incoming requests after outgoing DPR | Anders Svensson | 2015-03-22 | 1 | -5/+18 |
| | * | | | | Discard outgoing requests after outgoing DPR | Anders Svensson | 2015-03-22 | 1 | -3/+24 |
| | |/ / / | |||||
* | | | | | Merge branch 'maint' | Erland Schönbeck | 2015-03-23 | 3 | -40/+11 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'erland/revert_time/OTP-12444' into maint | Erland Schönbeck | 2015-03-23 | 3 | -38/+12 |
| |\ \ \ \ | |||||
| | * | | | | Revert "Use new time API and be back-compatible in ssh" | Erland Schönbeck | 2015-03-16 | 3 | -38/+12 |
* | | | | | | Merge branch 'ia/ssl/dialyzer/alpn-and-crl' | Ingela Anderton Andin | 2015-03-23 | 3 | -14/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ssl: Dialyzer fixes | Ingela Anderton Andin | 2015-03-23 | 3 | -14/+17 |
* | | | | | | | Merge branch 'maint' | Anders Svensson | 2015-03-22 | 4 | -15/+38 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'anders/diameter/17/time/OTP-12439' into maint | Anders Svensson | 2015-03-22 | 1 | -3/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Adapt app suite to changes in time api | Anders Svensson | 2015-03-19 | 1 | -3/+6 |
| * | | | | | | | Merge branch 'anders/diameter/time/OTP-12439' into maint | Anders Svensson | 2015-03-22 | 1 | -9/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Adapt to changes in time api | Anders Svensson | 2015-03-19 | 1 | -9/+6 |
| * | | | | | | | | Merge branch 'nox/fix-port_info-race' into maint | Zandra Hird | 2015-03-20 | 2 | -3/+26 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix a race condition when calling port_info/1 | Anthony Ramine | 2015-03-18 | 2 | -3/+26 |