summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2012-02-04 00:53:34 -0500
committerChris Buechler <cmb@pfsense.org>2012-02-04 00:53:34 -0500
commit459bb026f6a8339c16434ba95c84c66f730bf2fe (patch)
treee6461c814e637105869ab5d1294661aad0a53151
parenta748b37228bef41f3e3a423cc021bd9c3c4722a2 (diff)
downloadpfsense-459bb026f6a8339c16434ba95c84c66f730bf2fe.zip
pfsense-459bb026f6a8339c16434ba95c84c66f730bf2fe.tar.gz
correct branches in gitsync
-rw-r--r--etc/phpshellsessions/gitsync5
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync
index 81ea653..3e6a949 100644
--- a/etc/phpshellsessions/gitsync
+++ b/etc/phpshellsessions/gitsync
@@ -52,8 +52,9 @@ if(is_dir("/root/pfsense/HEAD"))
/* NOTE: Set branches here */
$branches = array(
- "master" => "2.0 development branch",
- "RELENG_1_2" => "1.2* release branch",
+ "master" => "2.1 development branch",
+ "RELENG_2_0" => "2.0.* release branch",
+ "RELENG_1_2" => "1.2.* release branch",
"build_commit" => "The commit originally used to build the image"
);
OpenPOWER on IntegriCloud