Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support type relaxation for JSON import #891

Merged
merged 10 commits into from Jun 5, 2020
Merged

Support type relaxation for JSON import #891

merged 10 commits into from Jun 5, 2020

Conversation

dominiklohmann
Copy link
Member

No description provided.

@dominiklohmann dominiklohmann added the feature New functionality label May 29, 2020
@dominiklohmann dominiklohmann force-pushed the story/ch16777 branch 4 times, most recently from d97943b to ba70500 Compare May 29, 2020 14:40
mavam
mavam reviewed May 29, 2020
View reviewed changes
libvast/vast/format/json.hpp Outdated Show resolved Hide resolved
mavam
mavam requested changes May 29, 2020
View reviewed changes
libvast/vast/concept/parseable/vast/json.hpp Outdated Show resolved Hide resolved
libvast/src/format/json.cpp Outdated Show resolved Hide resolved
libvast/src/format/json.cpp Outdated Show resolved Hide resolved
libvast/src/format/json.cpp Outdated Show resolved Hide resolved
libvast/src/format/json.cpp Outdated Show resolved Hide resolved
libvast/src/format/json.cpp Outdated Show resolved Hide resolved
libvast/src/format/json.cpp Outdated Show resolved Hide resolved
@dominiklohmann dominiklohmann requested a review from mavam June 3, 2020 14:55
@dominiklohmann
Copy link
Member Author

I rebased this onto current master to solve the conflict.

@dominiklohmann dominiklohmann requested a review from mavam June 4, 2020 13:25
mavam
mavam requested changes Jun 4, 2020
View reviewed changes
libvast/vast/concept/parseable/vast/json.hpp Outdated Show resolved Hide resolved
libvast/vast/concept/parseable/vast/json.hpp Outdated Show resolved Hide resolved
libvast/vast/concept/parseable/vast/json.hpp Outdated Show resolved Hide resolved
libvast/test/parseable.cpp Show resolved Hide resolved
@dominiklohmann dominiklohmann requested a review from mavam June 4, 2020 14:41
@dominiklohmann dominiklohmann changed the title Support optional type relaxation for JSON import Support type relaxation for JSON import Jun 5, 2020
mavam
mavam requested changes Jun 5, 2020
View reviewed changes
vast.conf Show resolved Hide resolved
libvast/vast/format/json.hpp Show resolved Hide resolved
libvast/vast/format/json.hpp Outdated Show resolved Hide resolved
@dominiklohmann
Copy link
Member Author

Done @mavam.

@dominiklohmann dominiklohmann requested a review from mavam June 5, 2020 08:51
@dominiklohmann dominiklohmann merged commit eda3bb8 into master Jun 5, 2020
@dominiklohmann dominiklohmann deleted the story/ch16777 branch June 5, 2020 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mavam mavam mavam approved these changes

Assignees
No one assigned
Labels
feature New functionality
Projects
None yet
Milestone
No milestone
2 participants
@dominiklohmann @mavam