Merge "Fix path of os_defaults.yaml" into stable/brahmaputra
authorjose.lausuch <jose.lausuch@ericsson.com>
Tue, 12 Jan 2016 12:33:53 +0000 (12:33 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 12 Jan 2016 12:33:53 +0000 (12:33 +0000)
commit4013ab7c4947a926604c67655be96b8e9cf382dd
treef0a580ab5d5a11332224de09dff06c140295d52c
parente97a0278f4fe860a4d54d85487b02b2bd1b1aee9
parent1ba960e01372c1210c644dc52a8ecae46a3b6b16
Merge "Fix path of os_defaults.yaml" into stable/brahmaputra