aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco/test/Makefile
diff options
context:
space:
mode:
authorGustav Simonsson <[email protected]>2012-05-31 11:28:41 +0200
committerGustav Simonsson <[email protected]>2012-05-31 11:28:41 +0200
commit570f71bd3e5c6ace878a0ec0ed64e09864410b32 (patch)
treeb1690b2013550247f72abab5f883500b9f01c882 /lib/megaco/test/Makefile
parent4535d409f75eeeb0e36b53f3a59d4f6e6f9529d1 (diff)
parent7a92687ec2b44353fef273a9e1e731f64c4a6d2e (diff)
downloadotp-570f71bd3e5c6ace878a0ec0ed64e09864410b32.tar.gz
otp-570f71bd3e5c6ace878a0ec0ed64e09864410b32.tar.bz2
otp-570f71bd3e5c6ace878a0ec0ed64e09864410b32.zip
Merge branch 'gustav/os_mon/disksup_call_timeout/OTP-10100' into maint
* gustav/os_mon/disksup_call_timeout/OTP-10100: Add infinity timeout to os_mon calls
Diffstat (limited to 'lib/megaco/test/Makefile')
0 files changed, 0 insertions, 0 deletions