From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 19 Sep 2017 08:07:30 +0000 (+0200)
Subject: Merge branch 'v2.0'
X-Git-Tag: v3.0.0~17
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=07a88ed2e8985d3001766247baad258e264b5338

Merge branch 'v2.0'

Change-Id: I2793984f7d0fe713fb61c39564c44e68c9494972
---

07a88ed2e8985d3001766247baad258e264b5338
diff --cc devops-stages/stage-build.sh
index 85054995,4c35ccd2..25de71a7
--- a/devops-stages/stage-build.sh
+++ b/devops-stages/stage-build.sh
@@@ -1,2 -1,4 +1,4 @@@
  #!/bin/sh
- make package
 -make clean all BRANCH=v2.0
++make clean all BRANCH=master
+ #make install && \
+ #make test