diff options
| author | Chris Buechler <cmb@pfsense.org> | 2013-05-22 19:26:51 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2013-05-22 19:26:51 -0500 |
| commit | 1546aaf0ea8f0cd126b36b04407d51fbbc446576 (patch) | |
| tree | da9d24faad9aca35a4e952c7b107d4859974b356 /etc/phpshellsessions | |
| parent | 2293c0d3b8228e63f65440fa81050efb2fad338c (diff) | |
| download | pfsense-1546aaf0ea8f0cd126b36b04407d51fbbc446576.zip pfsense-1546aaf0ea8f0cd126b36b04407d51fbbc446576.tar.gz | |
fixup gitsync for 2.1/2.2
Diffstat (limited to 'etc/phpshellsessions')
| -rw-r--r-- | etc/phpshellsessions/gitsync | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync index e69e654..2b4eec1 100644 --- a/etc/phpshellsessions/gitsync +++ b/etc/phpshellsessions/gitsync @@ -19,7 +19,8 @@ $GITSYNC_MERGE = "/root/.gitsync_merge"; /* NOTE: Set branches here */ $branches = array( - "master" => "2.1 development branch", + "master" => "2.2 development branch", + "RELENG_2_1" => "2.1.* release 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" |
