Merge branch 'bmk/snmp/snmp4215_integration/r14' into maint-r14

* bmk/snmp/snmp4215_integration/r14:
  [snmp] Fixed release notes. Used wrong ticket number
  [snmp/agent] Updated appup file
  [snmp/agent] Updated release notes
  [snmp/agent] Removed the (unused) serializer part
  [snmp/agent] Use unique temporary file name during vacm table dumnping
  [snmp/agent] Add common timestamp format function.
  [snmp/agent] Synchronization feature added
  [snmp/agent] Creating a unique temporary file whe dumping vacm
  [snmp/agent] Changed version
  [snmp/agent] Found another old-style fun (2-tuple)
  [snmp/agent] Removed use of old style tuple funs

1 files changed, 4 insertions, 11 deletions

diff --git a/lib/snmp/test/snmp_test_mgr_misc.erl b/lib/snmp/test/snmp_test_mgr_misc.erl
index fc6dedd96d..5525c5c3ec 100644
--- a/lib/snmp/test/snmp_test_mgr_misc.erl
+++ b/lib/snmp/test/snmp_test_mgr_misc.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -779,16 +779,9 @@ d(F,A) -> d(get(debug),F,A).
 
 d(true,F,A) ->
     io:format("*** [~s] MGR_PS_DBG *** " ++ F ++ "~n",
-	      [format_timestamp(now())|A]);
+	      [formated_timestamp()|A]);
 d(_,_F,_A) -> 
     ok.
 
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
-
+formated_timestamp() ->
+    snmp_test_lib:formated_timestamp().