summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-02-10 19:28:33 -0200
committerRenato Botelho <renato@netgate.com>2017-02-10 19:28:33 -0200
commitfa0243db5e23971e2f7ea8075e8ac11ece314bf8 (patch)
treeee60d5aa2027d8d8700aac8454d82139014fcd31 /src
parent5eb5856ac212ac30f5174e05cba68af8c88631e1 (diff)
downloadpfsense-fa0243db5e23971e2f7ea8075e8ac11ece314bf8.zip
pfsense-fa0243db5e23971e2f7ea8075e8ac11ece314bf8.tar.gz
It's time to 2.3.3-RC
Diffstat (limited to 'src')
-rw-r--r--src/etc/phpshellsessions/gitsync3
-rw-r--r--src/etc/version2
-rw-r--r--src/usr/local/www/system_update_settings.php2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync
index fd2b046..8148fe7 100644
--- a/src/etc/phpshellsessions/gitsync
+++ b/src/etc/phpshellsessions/gitsync
@@ -60,7 +60,7 @@ require_once("pfsense-utils.inc");
$GIT_PKG = "git"; // Either "git" or the full package URL
$GIT_BIN= "/usr/local/bin/git";
$GIT_REPO = "git://github.com/pfsense/pfsense.git";
-$DEFAULT_BRANCH = "RELENG_2_3";
+$DEFAULT_BRANCH = "RELENG_2_3_3";
$CODIR = "/root/pfsense";
$GITSYNC_MERGE = "/root/.gitsync_merge";
@@ -68,6 +68,7 @@ $GITSYNC_MERGE = "/root/.gitsync_merge";
$branches = array(
"master" => "2.4 development branch",
"RELENG_2_3" => "2.3 development branch",
+ "RELENG_2_3_3" => "2.3.3 stable branch",
"build_commit" => "The commit originally used to build the image"
);
diff --git a/src/etc/version b/src/etc/version
index 401cd3d..be6f500 100644
--- a/src/etc/version
+++ b/src/etc/version
@@ -1 +1 @@
-2.3.3-DEVELOPMENT
+2.3.3-RC
diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php
index c0b2a3f..c1eac9f 100644
--- a/src/usr/local/www/system_update_settings.php
+++ b/src/usr/local/www/system_update_settings.php
@@ -253,7 +253,7 @@ if (file_exists("/usr/local/bin/git") && $g['platform'] == $g['product_name']) {
'Branch name',
'text',
($gitcfg['branch'] ? $gitcfg['branch'] : '')
- ))->setHelp('The most recently used branch was "%s". (Usually the branch name is RELENG_2_3)' .
+ ))->setHelp('The most recently used branch was "%s". (Usually the branch name is RELENG_2_3_3)' .
'<br />Note: Sync will not be performed if a branch is not specified.', [$lastbranch]);
$group = new Form_Group('Sync options');
OpenPOWER on IntegriCloud