diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync index a5618f7d9f..d05528e3d6 100644 --- a/src/etc/phpshellsessions/gitsync +++ b/src/etc/phpshellsessions/gitsync @@ -34,7 +34,7 @@ $GITSYNC_MERGE = "/root/.gitsync_merge"; /* NOTE: Set branches here */ $branches = array( - "master" => "2.4.1 development branch", + "master" => "2.4.3 development branch", "build_commit" => "The commit originally used to build the image" ); diff --git a/src/etc/version b/src/etc/version index 600142b2e1..66688008fe 100644 --- a/src/etc/version +++ b/src/etc/version @@ -1 +1 @@ -2.4.2-DEVELOPMENT +2.4.3-DEVELOPMENT diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 421262ba53..f638239853 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -275,11 +275,11 @@ export PKG_REPO_SERVER_RELEASE=${PKG_REPO_SERVER_RELEASE:-"pkg+https://pkg.pfsen export PKG_REPO_SERVER_STAGING=${PKG_REPO_SERVER_STAGING:-"pkg+http://${STAGING_HOSTNAME}/ce/packages"} if [ -n "${_IS_RELEASE}" -o -n "${_IS_RC}" ]; then - export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_4_1"} + export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_4_2"} export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}} export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_RELEASE}} else - export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_4_1"} + export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_4_2"} export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}} export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_DEVEL}} fi