diff options
| author | Micael Karlberg <[email protected]> | 2012-01-31 13:51:01 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-01-31 13:51:01 +0100 |
| commit | 92f9d6023275fbdf9a644c1061a5d1def49d13a3 (patch) | |
| tree | 685a5c0e569dccb92a963c7087b7372acb1ed826 /lib/snmp/doc/src/snmpa.xml | |
| parent | b55c3d29a3d9efce2ce6548963809fc3b7ab8729 (diff) | |
| parent | b16baad540d35b890c0c6baf9a1be2a90ea96239 (diff) | |
| download | otp-92f9d6023275fbdf9a644c1061a5d1def49d13a3.tar.gz otp-92f9d6023275fbdf9a644c1061a5d1def49d13a3.tar.bz2 otp-92f9d6023275fbdf9a644c1061a5d1def49d13a3.zip | |
Merge branch 'maint-r13' into bmk/snmp/snmp4217_integration/r14
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/doc/src/snmpa.xml
lib/snmp/src/agent/snmpa_mpd.erl
lib/snmp/src/app/snmp.appup.src
lib/snmp/test/snmp_agent_test.erl
lib/snmp/vsn.mk
Diffstat (limited to 'lib/snmp/doc/src/snmpa.xml')
| -rw-r--r-- | lib/snmp/doc/src/snmpa.xml | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/lib/snmp/doc/src/snmpa.xml b/lib/snmp/doc/src/snmpa.xml index 27d89ea4e3..2322af28cc 100644 --- a/lib/snmp/doc/src/snmpa.xml +++ b/lib/snmp/doc/src/snmpa.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2004</year><year>2011</year> + <year>2004</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -198,12 +198,18 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} <type> <v>BackupDir = string()</v> <v>Agent = pid() | atom()</v> + <v>Reason = backup_in_progress | term()</v> </type> <desc> <p>Backup persistent/permanent data handled by the agent (such as local-db, mib-data and vacm). </p> <p>Data stored by mnesia is not handled. </p> <p>BackupDir cannot be identical to DbDir. </p> + <p>Simultaneous backup calls are <em>not</em> allowed. + That is, two different processes cannot simultaneously + successfully call this function. One of them will be first, + and succeed. The second will fail with the error reason + <c>backup_in_progress</c>. </p> <marker id="info"></marker> </desc> @@ -217,13 +223,13 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} </type> <desc> <p>Returns a list (a dictionary) containing information about - the agent. Information includes loaded MIBs, registered - sub-agents, some information about the memory allocation. </p> - <p>As of version 4.4 the format of the info has been changed. - To convert the info to the old format, call the - <seealso marker="#old_info_format">old_info_format</seealso> - function. </p> - + the agent. Information includes loaded MIBs, registered + sub-agents, some information about the memory allocation. </p> + <p>As of version 4.4 the format of the info has been changed. + To convert the info to the old format, call the + <seealso marker="#old_info_format">old_info_format</seealso> + function. </p> + <marker id="old_info_format"></marker> </desc> </func> |