diff options
| author | Björn Gustavsson <[email protected]> | 2015-05-29 10:51:53 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-05-29 10:51:53 +0200 |
| commit | eca01e7621918cb81535d0243d28adcc8dfbba34 (patch) | |
| tree | af7d31e2914601f8319f12a311af29a330a82758 | |
| parent | bc3a55ca6581fae7bc0f531979de0e46fd44aff5 (diff) | |
| parent | 3650d333cb06547b8b05ca90d08922a49f919cc6 (diff) | |
| download | otp-eca01e7621918cb81535d0243d28adcc8dfbba34.tar.gz otp-eca01e7621918cb81535d0243d28adcc8dfbba34.tar.bz2 otp-eca01e7621918cb81535d0243d28adcc8dfbba34.zip | |
Merge branch 'bjorn/megaco/eliminate-now'
* bjorn/megaco/eliminate-now:
megaco: Eliminate use of erlang:now/0
| -rw-r--r-- | lib/megaco/src/app/megaco.app.src | 2 | ||||
| -rw-r--r-- | lib/megaco/src/app/megaco.appup.src | 4 | ||||
| -rw-r--r-- | lib/megaco/src/engine/megaco_trans_sender.erl | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/megaco/src/app/megaco.app.src b/lib/megaco/src/app/megaco.app.src index 3720b1109e..573b1857f6 100644 --- a/lib/megaco/src/app/megaco.app.src +++ b/lib/megaco/src/app/megaco.app.src @@ -114,7 +114,7 @@ {env, []}, {mod, {megaco_sup, []}}, {runtime_dependencies, ["stdlib-2.5","runtime_tools-1.8.14","kernel-3.0", - "et-1.5","erts-6.0","debugger-4.0", + "et-1.5","erts-7.0","debugger-4.0", "asn1-3.0"]} ]}. diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src index 86ad09f639..1c55a92b55 100644 --- a/lib/megaco/src/app/megaco.appup.src +++ b/lib/megaco/src/app/megaco.appup.src @@ -191,7 +191,7 @@ {"%VSN%", [ - {"3.17.3", []}, + {"3.17.3", [{restart_application,megaco}]}, {"3.17.2", []}, {"3.17.1", [{restart_application,megaco}]}, {"3.17.0.3", [{restart_application,megaco}]}, @@ -206,7 +206,7 @@ } ], [ - {"3.17.3", []}, + {"3.17.3", [{restart_application,megaco}]}, {"3.17.2", []}, {"3.17.1", [{restart_application,megaco}]}, {"3.17.0.3", [{restart_application,megaco}]}, diff --git a/lib/megaco/src/engine/megaco_trans_sender.erl b/lib/megaco/src/engine/megaco_trans_sender.erl index 710fef405a..e07f404289 100644 --- a/lib/megaco/src/engine/megaco_trans_sender.erl +++ b/lib/megaco/src/engine/megaco_trans_sender.erl @@ -672,8 +672,7 @@ to(To, Start) -> %% Time in milli seconds t() -> - {A,B,C} = erlang:now(), - A*1000000000+B*1000+(C div 1000). + erlang:monotonic_time(milli_seconds). warning_msg(F, A) -> ?megaco_warning("Transaction sender: " ++ F, A). |