From 30b1f38a4cda7129d84e46793f3cdb7442b15493 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Thu, 12 May 2016 10:27:08 +0200 Subject: [PATCH] Move openrc file When the openrc file is managed by Git, your local changes end up conflicting with the remote version. This change renames the openrc file to openrc.default and updates the README.md file to take this into account. Change-Id: I4e5def6b38c3690a0c5d2ca64fa84045dc255fae --- .gitignore | 1 + README.md | 4 ++-- openrc => openrc.default | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename openrc => openrc.default (100%) diff --git a/.gitignore b/.gitignore index 9a490f6..2a1aca5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +openrc *.py[cod] __cache__ .cache diff --git a/README.md b/README.md index adf653f..11f76c1 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ It is based on two other projects: for the detailed procedure). 2. Prepare the environment: - vi openrc + cp openrc.default openrc + # Edit the openrc file as needed . openrc ./utils/fuel-qa-builder/prepare_env.sh @@ -66,4 +67,3 @@ The *OpenStack Development Mailing List* is the preferred way to communicate with the members of the project. Emails should be sent to `openstack-dev@lists.openstack.org` with the subject prefixed by `[fuel][plugins][lma]`. - diff --git a/openrc b/openrc.default similarity index 100% rename from openrc rename to openrc.default