diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2016-12-05 14:23:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-12-05 14:23:46 +0000 |
| commit | 07f362b0c267bfd12104b9c40f3f11595d2ee72e (patch) | |
| tree | 67d349451bac5c46f54ce159a527cb79e9403b8c /jjb/vpp | |
| parent | 82086ef901b1e5ab790d61f0fd171464d6f0d27e (diff) | |
| parent | 41d220f1ce14bef23a14e5b6ab0924f3dcafcdb7 (diff) | |
Merge "Revert "Put in check to make sure the patch is rebased late enough""
Diffstat (limited to 'jjb/vpp')
| -rw-r--r-- | jjb/vpp/include-raw-vpp-build.sh | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh index 2a0a10b61..b606fc698 100644 --- a/jjb/vpp/include-raw-vpp-build.sh +++ b/jjb/vpp/include-raw-vpp-build.sh @@ -34,11 +34,6 @@ sha1sum $0 (git log --oneline | grep 30d41ff > /dev/null 2>&1);if [ $? != 0 ]; then REBASE_NEEDED="1";fi (git log --oneline | grep fb0815d > /dev/null 2>&1);if [ $? == 0 ]; then VPP_REPO="1";fi - -# Due to a shift to make verify, after 2016-12-01 we need to make sure any patches -# coming in happen after 37682e1 -(git log --oneline | grep 37682e1 > /dev/null 2>&1);if [ $? != 0 ]; then REBASE_NEEDED="1";fi - echo "REBASE_NEEDED: ${REBASE_NEEDED}" echo "VPP_REPO: ${VPP_REPO}" |