diff options
| author | Kenneth Lundin <[email protected]> | 2012-03-29 17:16:31 +0200 |
|---|---|---|
| committer | Kenneth Lundin <[email protected]> | 2012-03-29 17:17:39 +0200 |
| commit | 6a3780b940c9406a48df6d55a0623e6d01892ac4 (patch) | |
| tree | 358719f79a59d8d58fb3d91dd3effa6d257af533 /lib/asn1/test/asn1_SUITE_data/Constraints.py | |
| parent | e1dda02164dfff667c7247502de442195a4b7d42 (diff) | |
| parent | f2802b90d02f41079dd7db4e14dbe9b6fea91255 (diff) | |
| download | otp-6a3780b940c9406a48df6d55a0623e6d01892ac4.tar.gz otp-6a3780b940c9406a48df6d55a0623e6d01892ac4.tar.bz2 otp-6a3780b940c9406a48df6d55a0623e6d01892ac4.zip | |
Merge branch 'kenneth/asn1/integer_range/OTP-9946' into maint
* kenneth/asn1/integer_range/OTP-9946:
replace 5 sec timeout (too short) with monitor in asn1_db requests
Correct handling of INTEGER (1..4 | 8 | 10 | 20)
Diffstat (limited to 'lib/asn1/test/asn1_SUITE_data/Constraints.py')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/Constraints.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/asn1/test/asn1_SUITE_data/Constraints.py b/lib/asn1/test/asn1_SUITE_data/Constraints.py index b18c29bd89..de48c4c2ca 100644 --- a/lib/asn1/test/asn1_SUITE_data/Constraints.py +++ b/lib/asn1/test/asn1_SUITE_data/Constraints.py @@ -51,6 +51,7 @@ Thing ::= INTEGER {fred (0),fred2 (1),fred3 (2)} AnotherThing ::= Thing (fred | fred2) I ::= INTEGER (0|15..269) -- OTP-5457 +X1 ::= INTEGER (1..4 | 8 | 10 | 20) -- OTP-9946 -- OTP-5511 |