Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
sunbird-lms-service
Commits
2fe3b794
Unverified
Commit
2fe3b794
authored
3 years ago
by
AMIT KUMAR
Committed by
GitHub
3 years ago
Browse files
Options
Download
Patches
Plain Diff
Merge Release 4.5.0 to Master (#1016)
* Merge release-4.5.0 to master
parent
bb23a8d0
Changes
51
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
Dockerfile
+1
-1
Dockerfile
controller/conf/log4j2.properties
+0
-16
controller/conf/log4j2.properties
controller/test/controllers/usermanagement/UserControllerTest.java
+5
-1
...r/test/controllers/usermanagement/UserControllerTest.java
core/actor-core/pom.xml
+0
-5
core/actor-core/pom.xml
core/cassandra-utils/pom.xml
+0
-5
core/cassandra-utils/pom.xml
core/cassandra-utils/src/main/java/org/sunbird/cassandraimpl/CassandraOperationImpl.java
+11
-13
...ava/org/sunbird/cassandraimpl/CassandraOperationImpl.java
core/es-utils/pom.xml
+0
-11
core/es-utils/pom.xml
core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
+11
-0
...atform-common/src/main/java/org/sunbird/keys/JsonKey.java
core/platform-common/src/main/java/org/sunbird/logging/LoggerUtil.java
+21
-2
...-common/src/main/java/org/sunbird/logging/LoggerUtil.java
core/platform-common/src/main/java/org/sunbird/telemetry/util/TelemetryGenerator.java
+5
-1
...n/java/org/sunbird/telemetry/util/TelemetryGenerator.java
core/platform-common/src/main/java/org/sunbird/telemetry/validator/TelemetryObjectValidatorV3.java
+8
-0
...nbird/telemetry/validator/TelemetryObjectValidatorV3.java
core/platform-common/src/main/resources/externalresource.properties
+7
-2
...orm-common/src/main/resources/externalresource.properties
core/platform-common/src/test/java/org/sunbird/logging/LoggerUtilTest.java
+71
-0
...mon/src/test/java/org/sunbird/logging/LoggerUtilTest.java
core/platform-common/src/test/java/org/sunbird/telemetry/util/TelemetryGeneratorTest.java
+4
-1
...va/org/sunbird/telemetry/util/TelemetryGeneratorTest.java
service/src/main/java/org/sunbird/actor/bulkupload/BaseBulkUploadBackgroundJobActor.java
+40
-0
...rd/actor/bulkupload/BaseBulkUploadBackgroundJobActor.java
service/src/main/java/org/sunbird/actor/bulkupload/LocationBulkUploadBackGroundJobActor.java
+22
-55
...ctor/bulkupload/LocationBulkUploadBackGroundJobActor.java
service/src/main/java/org/sunbird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java
+22
-40
...ird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java
service/src/main/java/org/sunbird/actor/bulkupload/UserBulkUploadBackgroundJobActor.java
+57
-50
...rd/actor/bulkupload/UserBulkUploadBackgroundJobActor.java
service/src/main/java/org/sunbird/actor/feed/UserFeedActor.java
+13
-29
...e/src/main/java/org/sunbird/actor/feed/UserFeedActor.java
service/src/main/java/org/sunbird/actor/role/FetchUserRoleActor.java
+16
-2
.../main/java/org/sunbird/actor/role/FetchUserRoleActor.java
with
314 additions
and
234 deletions
+314
-234
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets