Merge " Add virtual branch mapping Funtion: Prerelease Rules : check for...

diff --cc common/mapping.py
index 007c45f,d67ecac..5b83302
--- 1/common/mapping.py
--- 2/common/mapping.py
+++ b/common/mapping.py
@@@ -236,25 -193,9 +214,8 @@@ class MappingV2(object)
  
          return mapping
  
-     def get_contains_branch_mapping(self, project, branch=None):
-         """ Get contains branch mapping """
-         branchs = []
-         if self.mapping_obj.configure:
-             # if configure.enable is false then return []
-             if self.mapping_obj.configure.enable == 'false':
-                 return branchs
-         
-         if self.mapping_obj.branch:
-             for brch in self.mapping_obj.branch:
-                 for prj in brch.project:
-                     if (prj.name == project or prj.name == '/' + project) and (branch in brch.name.split(",") ):
-                         for b in brch.name.split(","):
-                             branchs.append(b)
- 
-         return branchs
- 
  def git_obs_map(gerrit_prj, gerrit_branch=None, gitcache=None, \
 -                gerrit_hostname=None, gerrit_username=None, gerrit_sshport=None, \
 -                include_config=False):
 +                gerrit_hostname=None, gerrit_username=None, gerrit_sshport=None):
      """
      Find an OBS project[s correspondent to Gerrit project and branch
      by parsing git-obs-mapping.xml.

diff --cc job_submit.py
Simple merge