aboutsummaryrefslogtreecommitdiffstats
path: root/TAR.include
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2012-11-05 16:54:45 +0100
committerAnders Svensson <[email protected]>2012-11-05 16:54:45 +0100
commitf14d113ac141d87b997dc5c9c1bb1154c1385291 (patch)
tree884e76beeab4e51638e4cb09ef12e63fd7673ce6 /TAR.include
parent172830959159cddd3db1c9aa544b174d22ffcf47 (diff)
parentde4669e2cb16f3a986cdf1df3f1757d8b8c9b646 (diff)
downloadotp-f14d113ac141d87b997dc5c9c1bb1154c1385291.tar.gz
otp-f14d113ac141d87b997dc5c9c1bb1154c1385291.tar.bz2
otp-f14d113ac141d87b997dc5c9c1bb1154c1385291.zip
Merge branch 'anders/diameter/patch/R15B02/upgrade/OTP-10550' into anders/diameter/patch/R15B02/OTP-10555
* anders/diameter/patch/R15B02/upgrade/OTP-10550: Allow for no diameter on remote node in connection guard
Diffstat (limited to 'TAR.include')
0 files changed, 0 insertions, 0 deletions