Skip to content

Commit

Permalink
Merge pull request #74 from project-sunbird/release-3.5.0
Browse files Browse the repository at this point in the history
Merging Release 3.5.0 Into Release-3.6.0
  • Loading branch information
RevathiKotla authored Jan 20, 2021
2 parents 423ed8c + 6b0018b commit b17e0e7
Showing 1 changed file with 3 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ object CommonUtil {
.set("spark.driver.memory", AppConf.getConfig("spark.driver_memory"))
.set("spark.memory.fraction", AppConf.getConfig("spark.memory_fraction"))
.set("spark.memory.storageFraction", AppConf.getConfig("spark.storage_fraction"))
.set("spark.sql.extensions", "com.datastax.spark.connector.CassandraSparkExtensions")
.set("directJoinSetting", "on")

val master = conf.getOption("spark.master")
// $COVERAGE-OFF$ Disabling scoverage as the below code cannot be covered as they depend on environment variables
if (master.isEmpty) {
Expand Down

0 comments on commit b17e0e7

Please sign in to comment.