From: Derek Higgins <derekh@redhat.com>
Date: Tue, 1 Oct 2013 08:29:53 +0000 (+0100)
Subject: Make test_merge.bash executable
X-Git-Tag: opnfv-6.0.0~2938
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0326335160a5977df44ae40d4c81ab8e40833743;p=apex-tripleo-heat-templates.git

Make test_merge.bash executable

This is an executable script, lets make it so.

Change-Id: Ie8e1196fdd7883447d05e89e001418d284bfcbf3
---

diff --git a/test_merge.bash b/test_merge.bash
old mode 100644
new mode 100755