Merge branch 'master' into clickhouse

2017-05-01 07:33:31 +02:00
parent 8f634a78b9 6c467b7448
commit 90ce1aa28a
262 changed files with 6465 additions and 2887 deletions
@@ -292,7 +292,8 @@
      sonarr = 274;
      radarr = 275;
      jackett = 276;
-      clickhouse = 277;
+      aria2 = 277;
+      clickhouse = 278;

      # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

@@ -554,7 +555,8 @@
      sonarr = 274;
      radarr = 275;
      jackett = 276;
-      clickhouse = 277;
+      aria2 = 277;
+      clickhouse = 278;

      # When adding a gid, make sure it doesn't match an existing
      # uid. Users and groups with the same name should have equal