Merge branch 'release/v1.9.0-rebase' of hardi/opt-cc into release/v1.9.0

2019-02-10 20:19:17 +01:00 · 2019-02-10 20:19:17 +01:00 · 3234c45047
parent b136278031 25abfdf66b
commit 3234c45047
3 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -49,6 +49,7 @@ Thumbs.db
 server/resource/
 server/apib/dredd/data/tmp-resource
 backup/
+!backup.sh

 # System
 .npm/
--- a/backup/backup.sh
+++ b/backup/backup.sh
@ -4,7 +4,7 @@
 cd $(dirname $0)

 # array of available collection names
-col=(app_user awarding campaign decoration logBudget logFlag logKill logPoints logRespawn logRevive logTransport logVehicle player promotion rank squad user war )
+col=(app_user awarding campaign decoration logBudget logFlag logKill logPlayerCount logPoints logRespawn logRevive logServerFps logTransport logVehicle player promotion rank squad user war)

 if [ -z "$1" ]
  then
--- a/docs/mongo-db-schema.odg
+++ b/docs/mongo-db-schema.odg