| commit | 77490b5eaefdc8797fd0531fc01c92ccb37400f4 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Thu Oct 16 15:25:36 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Thu Oct 16 15:25:36 2014 +0000 |
| tree | 42a60241c9cc77b4710f6f7e7619d86918c49ede | |
| parent | ddfbacef9fd0bd64b38674524f7829b42ed08bbd [diff] | |
| parent | a1707c7ef0a580bb8f5323ea3d060d0e82d831d7 [diff] |
Merge "XenAPI: Fix vimrc"
diff --git a/functions-common b/functions-common index 5b29fd3..9f4acfe 100644 --- a/functions-common +++ b/functions-common
@@ -522,8 +522,7 @@ # ``get_release_name_from_branch branch-name`` function get_release_name_from_branch { local branch=$1 - - if [[ $branch =~ "stable/" ]]; then + if [[ $branch =~ "stable/" || $branch =~ "proposed/" ]]; then echo ${branch#*/} else echo "master"