Merge pull request #147 from pzapletal/issue-145-configs

ISSUE-145: Akka configuration fix
scassandra · Apr 8, 2016 · b6499c4 · b6499c4
2 parents 9020667 + 04877bc
commit b6499c4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/java-client/build.gradle b/java-client/build.gradle
@@ -139,7 +139,7 @@ task wrapper(type: Wrapper) {
 }
 
 shadowJar {
-    append('reference.conf')
+    append('application.conf')
     relocate 'org.apache.cassandra', 'scassandra.org.apache.cassandra'
     relocate 'org.mortbay', 'scassandra.org.mortbay'
     relocate 'com.google.common', 'scassandra.com.google.common'

diff --git a/server/src/main/resources/reference.conf → server/src/main/resources/application.conf b/server/src/main/resources/reference.conf → server/src/main/resources/application.conf
@@ -12,8 +12,6 @@ scassandra.startup-timeout-ms=2000
 # Make your edits/overrides in your application.conf.
 
 akka {
-  # Akka version, checked against the runtime version of Akka.
-  version = "2.3.9"
 
   # Home directory of Akka, modules in the deploy directory will be loaded
   home = ""

diff --git a/server/src/test/resources/reference.conf → server/src/test/resources/application.conf b/server/src/test/resources/reference.conf → server/src/test/resources/application.conf
@@ -11,8 +11,6 @@ scassandra.admin.listen-address=localhost
 # Make your edits/overrides in your application.conf.
 
 akka {
-  # Akka version, checked against the runtime version of Akka.
-  version = "2.3.9"
 
   # Home directory of Akka, modules in the deploy directory will be loaded
   home = ""