Skip to content
Snippets Groups Projects
Commit d49250c4 authored by Karina Cadette's avatar Karina Cadette
Browse files

Squashed commit of the following

commit f4e2ee57 
Author: David Diederich <d.diederich@opengroup.org> 
Date: Wed Feb 02 2022 11:23:09 GMT-0600 (Central Standard Time) 

    Update version of default branch to 0.14.0-SNAPSHOT


commit df2d108b 
Author: Alok Joshi <ajoshi19@slb.com> 
Date: Tue Feb 01 2022 15:24:17 GMT-0600 (Central Standard Time) 

    Merge branch 'smart_json_fix' into 'master'

Update json-smart

See merge request !160

commit 8357eea8 
Author: Yunhua Koglin <kogliny@amazon.com> 
Date: Thu Jan 27 2022 11:58:15 GMT-0600 (Central Standard Time) 

    Merge branch 'aws-integration' into 'master'

merge changes for m10

See merge request !158

commit 59a49d48 
Author: Alok Joshi <AJoshi19@slb.com> 
Date: Tue Feb 01 2022 14:19:06 GMT-0600 (Central Standard Time) 

    update NOTICE


commit 0ede9df4 
Author: Alok Joshi <AJoshi19@slb.com> 
Date: Tue Feb 01 2022 13:36:31 GMT-0600 (Central Standard Time) 

    update json-smart
parent b97eb890
No related branches found
No related tags found
2 merge requests!211Updated topics.json - Replace common with osdu as common data partition is not a concept in OSDU.,!180Update pom version
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment