ISSUE-475: Remove deprecated 'database' keyword

- Remove deprecated 'database' keyword from cassandra-reaper.yaml files
thelastpickle · Sep 7, 2018 · a7a7913 · a7a7913
1 parent 79685e1
commit a7a7913
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/src/packaging/resource/cassandra-reaper.yaml b/src/packaging/resource/cassandra-reaper.yaml
@@ -71,13 +71,6 @@ server:
   requestLog:
     appenders: []
 
-database:
-  # PostgreSQL JDBC settings
-  driverClass: org.postgresql.Driver
-  user: postgres
-  password: postgres
-  url: jdbc:postgresql://127.0.0.1/reaper
-
 autoScheduling:
   enabled: false
   initialDelayPeriod: PT15S

diff --git a/src/server/src/test/resources/cassandra-reaper-h2-at.yaml b/src/server/src/test/resources/cassandra-reaper-h2-at.yaml
@@ -44,14 +44,7 @@ jmxCredentials:
     username: cassandra
     password: cassandrapassword
 
-# database section will be ignored if storageType is set to "memory"
-#h2:
-  # H2 JDBC settings
-#  url: jdbc:h2:/tmp/reaper-db;MODE=PostgreSQL
-#  user:
-#  password:
-
-database:
+h2:
   # H2 JDBC settings
   driverClass: org.h2.Driver
   url: jdbc:h2:/tmp/reaper-db/db;MODE=PostgreSQL