Merge release branch 4.8 to master

* 4.8: writeIfNotHere requires an array of strings, not a string
cloudtrends · May 12, 2016 · 3f97908 · 3f97908
2 parents f88cb88 + a1e181c
commit 3f97908
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scripts/network/ping/baremetal_user_data.py b/scripts/network/ping/baremetal_user_data.py
@@ -93,7 +93,7 @@ def addUserData(vmIp, folder, fileName, contents):
  f.close()
 
  if folder == "metadata" or folder == "meta-data":
- writeIfNotHere(metaManifest, fileName)
+ writeIfNotHere(metaManifest, [fileName])
 
 if __name__ == '__main__':
  string = sys.argv[1]