commit 3727cd18f72824c677599377999a96a60ce43746
author Martin Polreich <polreichmartin@gmail.com> Tue Jul 25 11:45:53 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue Jul 25 11:45:53 2017 +0000
tree 4df9f058d14419cad6b3e8560e9acc5ad5fce750
parent 9b99f79087eb6da7efbbc258716c33e8711d836c
parent dfe74ac2ac4f6f824ab5d9d42a8ac487f4b8e315

Merge "Allow Travis CI to run parallel tests"

backupninja/meta/backupninja.yml

diff --git a/backupninja/meta/backupninja.yml b/backupninja/meta/backupninja.yml
deleted file mode 100644
index ff227f6..0000000
--- a/backupninja/meta/backupninja.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-backup:
-  backupninja:
-    fs_includes:
-    - /var/backups
-    fs_excludes: []

metadata/service/support.yml

diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 006b6ed..8107660 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -2,7 +2,7 @@
   backupninja:
     _support:
       backupninja:
-        enabled: true
+        enabled: false
       collectd:
         enabled: false
       heka: