Merged
Conversation
Contributor
Author
|
@emmanvg, can you look at this and see if I missed anything obvious. Otherwise, if the build passes, can you go ahead and merge? |
Contributor
|
@gtback, the CIQ tests are passing, but there is a test not passing on: https://github.com/STIXProject/python-stix/blob/ciq-updates/stix/test/indicator_test.py#L460 |
Contributor
|
Never mind, it might be a problem on my side. Travis seems to find no conflicts. We should be all set. |
Contributor
Author
|
Thanks! I couldn't get that test to fail; you had me worried ;-) |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Add the changes from the stix1.1.1 branch to master.