This repository has been archived by the owner on Feb 12, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 52
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: src/raml1/test/data/TCK/RAML10/Annotations/test020/apiInvalid-tck.json src/raml1/test/data/TCK/RAML10/Examples/test013/api-tck.json src/raml1/test/data/TCK/RAML10/Overlays/test001/api.raml src/raml1/test/data/TCK/RAML10/Overlays/test022/api.raml src/raml1/test/data/TCK/RAML10/Overlays/test029/api-tck.json src/raml1/test/data/TCK/RAML10/Overlays/test029/overlay.raml src/raml1/test/data/TCK/RAML10/Specifications/world-music-api/api-tck.json src/raml1/test/data/TCK/RAML10/spec-examples/APIs/annotations-tck.json src/raml1/test/data/TCK/RAML10/spec-examples/APIs/file-type-tck.json src/raml1/test/data/TCK/RAML10/spec-examples/APIs/resourcetypes-traits-parameterfunctions-tck.json src/util/TCKDumper.ts
types, annotationTypes, securitySchemes, traits, resourceTypes, methods
Conflicts: src/raml1/ast.core/expander.ts src/raml1/highLevelImpl.ts src/raml1/wrapped-ast/wrapperHelper.ts src/util/TCKDumper.ts workspace.json
Conflicts: src/raml1/test/data/LibraryExpansion/Specifications/world-music-api/api-tck.json src/raml1/test/data/TCK/raml-1.0/Annotations/scalars/test019/api-tck.json src/raml1/test/data/TCK/raml-1.0/Annotations/scalars/test020/api-tck.json src/raml1/test/data/TCK/raml-1.0/Types/ObjectTypes/typeKind2/oType01-tck.json src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/date-types-tck.json src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/file-type-tck.json src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/integer-type-tck.json src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/multiple-inheritance-2-tck.json src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/multiple-inheritance-3-invalid-tck.json src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/number-type-tck.json src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/union-type-multiple-inheritance-tck.json src/raml1/wrapped-ast/defaultCalculator.ts
Conflicts: src/raml1/ast.core/expander.ts src/raml1/test/data/LibraryExpansion/ReferencesPatching/NilableTypes/test001/api-tck.json src/raml1/test/data/functions/dumps/parseStructuredExample0.dump
KonstantinSviridov
force-pushed
the
tck-schema-changes
branch
from
February 6, 2017 12:12
9bce005
to
ed8861f
Compare
Conflicts: src/raml1/test/data/LibraryExpansion/ReferencesPatching/Types/test001/api-tck.json src/raml1/test/data/LibraryExpansion/Specifications/world-music-api/api-tck.json src/raml1/test/data/TCK/raml-1.0/Fragments/test010/api-tck.json src/raml1/test/data/TCK/raml-1.0/Others/world-music-api/api-tck.json src/raml1/test/data/TCK/raml-1.0/Types/External Types/test001/api-tck.json src/raml1/test/data/TCK/raml-1.0/Types/External Types/test002/api-tck.json src/raml1/test/data/TCK/raml-1.0/Types/External Types/test004/api-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test001/apiInvalid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test001/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test002/apiInvalid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test002/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test003/apiInvalid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test003/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test004/apiInvalid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test004/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test005/apiInvalid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test005/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test006/apiInvalid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test006/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test007/apiInvalid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test007/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test008/apiInvalid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test008/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test009/apiInvalid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test009/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/test010/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/Types/xsdscheme/typeKind/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/jsonscheme/test5/apiInvalid-tck.json src/raml1/test/data/TCK/raml-1.0/jsonscheme/test5/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/jsonscheme/test6/apiInvalid-tck.json src/raml1/test/data/TCK/raml-1.0/jsonscheme/test6/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/jsonscheme/test7/apiInvalid-tck.json src/raml1/test/data/TCK/raml-1.0/jsonscheme/test7/apiValid-tck.json src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/bodies-tck.json src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/external-type-extend-invalid-tck.json src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/external-types-invalid-tck.json src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/external-types-tck.json src/raml1/test/data/TCK/raml-1.0/spec-examples/APIs/responses-tck.json src/raml1/test/data/vfsTests/jsonRefsTest001/api-tck.json src/raml1/test/data/vfsTests/test003/api-tck.json
…-js-parser-2 into tck-schema-changes
The code has been merged manually in cb99a46 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implementing #562