aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2012-02-02 15:45:07 +0100
committerErlang/OTP <[email protected]>2012-02-02 15:45:07 +0100
commit0c9547c384ba9d299d4a73bdf2a514c2b47128cd (patch)
tree58f49deaf3c65cdefeffe88a00443cf3b64753ca /erts
parent61fa5c03369e9ae6de2b4ae24438c236df93d7cb (diff)
parent94da0412ba37e62567e3e377c1c6063c379c0fe1 (diff)
downloadotp-0c9547c384ba9d299d4a73bdf2a514c2b47128cd.tar.gz
otp-0c9547c384ba9d299d4a73bdf2a514c2b47128cd.tar.bz2
otp-0c9547c384ba9d299d4a73bdf2a514c2b47128cd.zip
Merge branch 'bmk/snmp4217_integration/r15' into maint-r15
* bmk/snmp4217_integration/r15: Prepare release [snmp/agent] Add proper release notes [snmp/agent] Wrong OID used for error message reply [snmp/agent] Added backup check for local_db [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfere
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions