aboutsummaryrefslogtreecommitdiffstats
path: root/lib/cosProperty/Makefile
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-09-29 17:54:27 +0200
committerLukas Larsson <[email protected]>2011-09-29 17:54:27 +0200
commit71099221fc8d0456fb38b1954e9053ec527d43b2 (patch)
tree6e0b29ded24837b7e31c1ddcd0df5608c1af199e /lib/cosProperty/Makefile
parentfbf611254ded96a0bbeedb76b895f39958b04edc (diff)
parent1be1c1cb15068aed40a30210c8be34f36e38ed66 (diff)
downloadotp-71099221fc8d0456fb38b1954e9053ec527d43b2.tar.gz
otp-71099221fc8d0456fb38b1954e9053ec527d43b2.tar.bz2
otp-71099221fc8d0456fb38b1954e9053ec527d43b2.zip
Merge branch 'dev' into major
* dev: Skip create_big_boot on platforms without crypto Remove test_server path instead of cwd for clash test Skip getaddr_v6 test if on the ipv4_only host Use static port for old solaris versions Extend time to wait for zone files to be loaded Allow out of memory exception for max_port checks Extend slave start timeout for windows tests Double timeout to make sure debug builds pass Use now instead of os:timestamp Increase timeout in scheduler_suspend for slow platforms Skip update_cpu_info if 'taskset' cannot be found
Diffstat (limited to 'lib/cosProperty/Makefile')
0 files changed, 0 insertions, 0 deletions