diff options
| author | Lukas Larsson <[email protected]> | 2012-03-23 16:32:03 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-03-23 16:32:03 +0100 |
| commit | bb8e2844a5714ef29247d558ff0d71d5f944ad82 (patch) | |
| tree | 57d69db6cd7af9a2b636221e3772650ff40ee68a /erts | |
| parent | 0fa4703b49ce7b00c4d90bc1cdf8d195e6f38f00 (diff) | |
| parent | 158b7744435e6f8500825b60f9002b5bf0639d6b (diff) | |
| download | otp-bb8e2844a5714ef29247d558ff0d71d5f944ad82.tar.gz otp-bb8e2844a5714ef29247d558ff0d71d5f944ad82.tar.bz2 otp-bb8e2844a5714ef29247d558ff0d71d5f944ad82.zip | |
Merge branch 'maint'
* maint:
Change default of enable builtin hooks to undefined
Disable built in hooks for emulator
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/emulator.spec | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/test/emulator.spec b/erts/emulator/test/emulator.spec index 1ea751cc3b..7a6dd83020 100644 --- a/erts/emulator/test/emulator.spec +++ b/erts/emulator/test/emulator.spec @@ -1 +1,2 @@ +{enable_builtin_hooks, false}. {suites,"../emulator_test",all}. |