SB-21700 - Conflicts Resolve ( Release 4.4.0 Into Master ) #494

Open

manjudr wants to merge 677 commits intoSunbird-Ed:masterfrom manjudr:conflics-resolve

+7,983-42,204

This pull request is big! We're only showing the most recent 250 commits

Commits on Jun 30, 2021

Issue #SB-24872: Validate invalid batchId in data-exhaust job
utk14
committed
Merge branch 'release-4.1.0' of https://github.com/Sunbird-Ed/sunbird-data-products into merge-branch-4.0
utk14
committed

Commits on Jul 2, 2021

Issue SC-000: Code changes to load parallel batches from report cluster
RevathiKotla
committed
Merge remote-tracking branch 'upstream/release-4.1.0' into SB-24841
Hari-stackroute
committed
Merge branch 'release-4.1.0' of https://github.com/Sunbird-Ed/sunbird-data-products into validate-batch-4.1
utk14
committed
Merge Conflict issue resolved
utk14
committed
Merge pull request Sunbird-Ed#413 from utk14/validate-batch-4.1
SanthoshVasabhaktula
authored
Issue SC-000: Remove the println statement
RevathiKotla
committed
SB-24841 checking cluster and block locations of user, since block and cluster is optional and depends on config
Hari-stackroute
committed
Issue SC-000:Merge branch 'release-4.0.0' of https://github.com/Sunbird-Ed/sunbird-data-products into release-4.0.0
RevathiKotla
committed
Merge pull request Sunbird-Ed#410 from RevathiKotla/release-4.0.0
SanthoshVasabhaktula
authored
Issue SC-000: Fix the persist code issue
RevathiKotla
committed
Issue SC-000:Merge branch 'release-4.0.0' of https://github.com/Sunbird-Ed/sunbird-data-products into release-4.0.0
RevathiKotla
committed
Merge pull request Sunbird-Ed#415 from RevathiKotla/release-4.0.0
sowmya-dixit
authored

Commits on Jul 8, 2021

Commits on Jul 9, 2021

Commits on Jul 12, 2021

Commits on Jul 13, 2021

Merge pull request Sunbird-Ed#421 from manjudr/conflict-resolve
RevathiKotla
authored

Commits on Jul 14, 2021

Commits on Jul 15, 2021

Merge pull request Sunbird-Ed#428 from Hari-stackroute/SB-25676
anandp504
authored
Password Protected CSV Data Product Completed
Shakthieshwari
committed

Commits on Jul 16, 2021

Data Product for Password Protection CSV
Shakthieshwari
committed

Commits on Jul 20, 2021

Commits on Jul 21, 2021

Commits on Jul 22, 2021

Commits on Jul 23, 2021

Commits on Jul 27, 2021

Commits on Jul 28, 2021

circle cli build failed issue fix by mocking the test case
Shakthieshwari
committed
circle cli build failed issue fix by mocking the test case
Shakthieshwari
committed
circle cli build failed issue fix by mocking the test case
Shakthieshwari
committed

Commits on Jul 29, 2021

test assessment correction event print
Shakthieshwari
committed
Issue #0000: AssessmentCorrectionModel testcase fixed for V3Event deserialize issue
utk14
committed
Issue #0000: AssessmentCorrectionModel testcase fixed for V3Event deserialize issue
utk14
committed
Issue #0000: AssessmentCorrectionModel testcase fixed for V3Event deserialize issue
utk14
committed
Merge branch 'release-4.2.0' of github.com:Sunbird-Ed/sunbird-data-products into SB-24105
Shakthieshwari
committed
test assessment correct model event change
Shakthieshwari
committed
Merge pull request Sunbird-Ed#442 from utk14/release-4.2.0
sowmya-dixit
authored
test assessment correct model event change
Shakthieshwari
committed
test assessment correct model event change
Shakthieshwari
committed

Commits on Aug 2, 2021

Commits on Aug 5, 2021

Modify the code according to PR changes
Ashwiniev95
committed
Merge branch 'SB-24105' of https://github.com/shikshalokam/sunbird-data-products into SB-24105
Ashwiniev95
committed
re-used existing case class
Shakthieshwari
committed
re-used existing case class
Shakthieshwari
committed
re-used existing case class
Shakthieshwari
committed

Commits on Aug 6, 2021

filesMutable variable issue fixed
Shakthieshwari
committed
changes raised by santhosh
Shakthieshwari
committed

Commits on Aug 11, 2021

Modify according to design
Ashwiniev95
committed

Commits on Aug 12, 2021

Merge pull request Sunbird-Ed#431 from shikshalokam/SB-24105
SanthoshVasabhaktula
authored

Commits on Aug 19, 2021

Commits on Aug 22, 2021

Issue SB-24793 feat: Assessment score migration data product job implementation
manjudr
committed

Commits on Aug 26, 2021

Commits on Aug 27, 2021

Commits on Aug 30, 2021

Commits on Sep 2, 2021

Commits on Sep 3, 2021

close sparksession in main method under onDemandDruidExhaustJob
Shakthieshwari
committed
Issue SB-24793 feat: removed the unwanted files
manjudr
committed
Issue SB-24793 feat: Added the error handling in the file write
manjudr
committed
druid datasource name and project status column add
Shakthieshwari
committed
druid datasource name and project status column add
Shakthieshwari
committed
coverage bug fix on new code
Shakthieshwari
committed
coverage bug fix on new code
Shakthieshwari
committed

Commits on Sep 4, 2021

Issue #0 | Usercacheindexer fixes added
kumarks1122
committed

Commits on Sep 6, 2021

coverage off for main methof exception block
Shakthieshwari
committed
Merge pull request Sunbird-Ed#461 from shikshalokam/SB-24105
RevathiKotla
authored

Commits on Sep 7, 2021

Commits on Sep 8, 2021

Commits on Sep 16, 2021

Commits on Sep 21, 2021

Commits on Sep 22, 2021

Commits on Sep 27, 2021

Issue #TG-1089 fix: Remove On-demand druid exhaust jobs from this repo as it is moved to CoreDataProducts
sowmya-dixit
committed

Commits on Oct 4, 2021

Merge pull request Sunbird-Ed#480 from sowmya-dixit/release-4.3.0
RevathiKotla
authored

Commits on Oct 6, 2021

Commits on Oct 7, 2021

Merge pull request Sunbird-Ed#484 from Sunbird-Ed/release-4.3.0
manjudr
authored

Commits on Oct 8, 2021

Commits on Oct 11, 2021

Merge pull request Sunbird-Ed#486 from sowmya-dixit/release-4.3.0
RevathiKotla
authored

Commits on Oct 27, 2021

Commits on Nov 30, 2021

Merge remote-tracking branch 'upstream/release-4.4.0' into HEAD
manjudr
committed