From 6134dcf51e10cec9c986d4ae17cf8b1bbdda764f Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Wed, 22 May 2013 19:26:51 -0500 Subject: fixup gitsync for 2.1/2.2 --- etc/phpshellsessions/gitsync | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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" -- cgit v1.1