SB-21700 - Conflicts Resolve ( Release 4.4.0 Into Master ) #494
Conversation
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
…-data-products into merge-branch-4.0
…e invalid in request
Changes for user_id metrics in report
…-data-products into merge-branch-4.0
Merge branch R4.0.0 to R4.1.0
…d cluster is optional and depends on config
…-data-products into validate-batch-4.1
Issue #SB-24872: Validate invalid batchId in data-exhaust job
…d cluster is optional and depends on config
TG-965: Code changes for loading batches with parallesim for user enrolment data
Issue SC-000: Fix the persist code issue
…job-fix DIK-5379 - Missing records in the collection summary v2 report issue fix
…d cluster is optional and depends on config
…d cluster is optional and depends on config
…job-fix SB-15002 : removed the duplicate cassandra connection
SB-24793 - Release 4.2.0 into Release-4.3.0
…64-release-4.1.0 SB-24793 - Merge reverted migration script changes into release-4.2.0
SB-26855: ETB Metrics fix for druid stream query paramter issue
…o as it is moved to CoreDataProducts
Issue #TG-1089 fix: Remove On-demand druid exhaust jobs from this repo as it is moved to CoreDataProducts
SB-24793 - Conflict resolve - Merging release-4.2.1 into 4.3.0
SB-27029 - Release 4.3.0 into Release-4.4.0
…er duplicate requests came to the system
…er duplicate requests came to the system
…er duplicate requests came to the system
DD-1717 : Generating duplicate requests count metric
SB-26472 Filtering active user consent into the reports
SB-27386 filtering common rows in consent and user_declarations tables
# Conflicts: # data-products/src/main/resources/data.cql # data-products/src/main/scala/org/sunbird/analytics/job/report/AssessmentCorrectionJob.scala # data-products/src/main/scala/org/sunbird/analytics/model/report/AssessmentCorrectionModel.scala # data-products/src/test/resources/application.conf # data-products/src/test/scala/org/sunbird/analytics/job/report/TestAssessmentCorrectionJob.scala # data-products/src/test/scala/org/sunbird/analytics/model/report/TestAssessmentCorrectionModel.scala
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 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.
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
Type of change
Please choose appropriate options.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes in the below checkboxes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration:
Checklist: