From b2034cb32997cd613cc6cd94018382e207352d43 Mon Sep 17 00:00:00 2001
From: Daniel Preussker <preussker@quxlabs.com>
Date: Sun, 22 Nov 2015 17:06:21 +0000
Subject: [PATCH] Added master and release update-channels

---
 daily.php                 | 12 +++++++++++-
 includes/defaults.inc.php |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/daily.php b/daily.php
index 546335a8bd..40d4cd10a6 100644
--- a/daily.php
+++ b/daily.php
@@ -35,7 +35,17 @@ The ' . $config['project_name'] . ' team.';
         exit(2);
     }
     else {
-        exit((int) $config['update']);
+        if ($config['update']) {
+            if ($config['update_channel'] == 'master') {
+                exit(1);
+            }
+            elseif ($config['update_channel'] == 'release') {
+                exit(3);
+            }
+        }
+        else {
+            exit(0);
+        }
     }
 }
 
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index e1ca10d694..86685252b9 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -828,3 +828,6 @@ $config['availability-map-width']                       = 25;
 
 // Default notifications Feed
 $config['notifications']['LibreNMS']                    = 'http://www.librenms.org/notifications.rss';
+
+// Update channel (Can be 'master' or 'release')
+$config['update_channel']                               = 'master';