diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/phpshellsessions/gitsync | 3 | ||||
| -rw-r--r-- | src/etc/version | 2 | ||||
| -rw-r--r-- | src/usr/local/www/system_update_settings.php | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync index fd2b046..8b6750b 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_4"; $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_4" => "2.3.4 stable branch", "build_commit" => "The commit originally used to build the image" ); diff --git a/src/etc/version b/src/etc/version index 529d064..0aa25ee 100644 --- a/src/etc/version +++ b/src/etc/version @@ -1 +1 @@ -2.3.4-DEVELOPMENT +2.3.4-RELEASE diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php index 2a27fae..e51ccea 100644 --- a/src/usr/local/www/system_update_settings.php +++ b/src/usr/local/www/system_update_settings.php @@ -254,7 +254,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_4)' . '<br />Note: Sync will not be performed if a branch is not specified.', [$lastbranch]); $group = new Form_Group('Sync options'); |
