Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/5.x.x' into 5.x.x-oil-physical-l…
…eg-fwd # Conflicts: # rosetta-source/src/main/resources/cdm-sample-files/fpml-5-13/incomplete-products/commodity-derivatives/expectations.json # rosetta-source/src/main/resources/cdm-sample-files/fpml-5-13/processes/execution-advice/expectations.json # rosetta-source/src/main/resources/cdm-sample-files/fpml-5-13/products/equity-swaps/expectations.json # rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-incomplete-products-commodity-derivatives-aggregated-mapping-failure-report.csv # rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-incomplete-products-commodity-derivatives-failed-mappings-report.csv # rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-processes-execution-advice-aggregated-mapping-failure-report.csv # rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-processes-execution-advice-failed-mappings-report.csv # rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-products-equity-swaps-aggregated-mapping-failure-report.csv # rosetta-source/src/main/resources/mapping-analytics/fpml-5-13-products-equity-swaps-failed-mappings-report.csv # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex10-physical-oil-pipeline-crude-wti-floating-price.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex11-physical-oil-pipeline-heating-oil-fixed-price.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex12-physical-gas-europe-zbt-fixed-price.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex13-physical-gas-us-tw-west-texas-pool-floating-price-4-days.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex14-physical-gas-europe-ttf-fixed-price.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex15-physical-oil-pipeline-crude-wcs-fixed-price.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex16-physical-power-us-eei-floating-price.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex17-physical-power-uk-gtma-fixed-price.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex18-physical-power-us-eei-fixed-price-shaped-volume.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex20-physical-coal-us-fixed-price.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex21-physical-power-us-eei-fixed-price-shaped-volume-and-price.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex22-physical-gas-option-multiple-expiration.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex23-physical-power-option-daily-expiration-efet.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex29-physical-eu-emissions-option.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex30-physical-eu-emissions-forward.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex31-physical-us-emissions-option.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/commodity-derivatives/com-ex47-physical-eu-emissions-option-pred-clearing.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex69-execution-advice-commodity-swap-classification-new-trade-esma-emir-refit.json # rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex70-execution-advice-commodity-swap-classification-termination-esma-emir-refit.json
- Loading branch information