Skip to content

Commit 279cdec

Browse files
committed
frontera: yet another hack branch
Signed-off-by: Dalton Bohning <dalton.bohning@intel.com>
1 parent 810d6a7 commit 279cdec

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

frontera/run_build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ function git_has_commit() {
119119
# Merge a "hack" branch and user-specified branches
120120
function merge_extra_daos_branches() {
121121
local hack_branch=""
122-
if $(git_has_commit "59bdf06") = true; then
122+
if $(git_has_commit "6373e4f") = true; then
123+
hack_branch="origin/dbohning-io500-base-6373e4f-2.2"
124+
elif $(git_has_commit "59bdf06") = true; then
123125
hack_branch="origin/dbohning-io500-base-59bdf06"
124126
elif $(git_has_commit "b1933c3") = true; then
125127
hack_branch="origin/dbohning-io500-base-b1933c3"

0 commit comments

Comments
 (0)