diff options
| author | Lukas Larsson <[email protected]> | 2012-11-02 15:22:59 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-11-02 15:22:59 +0100 |
| commit | 2fac860004a2eece19c62053b3c0fd5210ca7051 (patch) | |
| tree | 1abdd2c481ee4db7d7ace99746c4f32a57338ea6 /bootstrap | |
| parent | 985f2a9aa2460e648981bb4538eb446202d25d9d (diff) | |
| parent | 045319da07722f1dd01af8c07dc1bcc196ffb137 (diff) | |
| download | otp-2fac860004a2eece19c62053b3c0fd5210ca7051.tar.gz otp-2fac860004a2eece19c62053b3c0fd5210ca7051.tar.bz2 otp-2fac860004a2eece19c62053b3c0fd5210ca7051.zip | |
Merge branch 'maint'
* maint:
Skip ct_netconf tests if there is no crypto
Migrate timers from test_server to ct interface
Update tests to run with an oldshell emulator
Move crypto check so that tc is skipped and not failed
Update for new version of ppc compilation chain
Verify that ebin folder of applications exists
Conflicts:
lib/asn1/test/asn1_SUITE.erl
lib/kernel/test/interactive_shell_SUITE.erl
Diffstat (limited to 'bootstrap')
0 files changed, 0 insertions, 0 deletions