Fixing merge conflicts

This commit is contained in:
Nitin Madhok 2014-06-26 13:57:14 -04:00
commit 0562d1a8a5

View File

@ -81,7 +81,7 @@ Set up the cloud config at ``/etc/salt/cloud``:
gce-config:
# Set up the Project name and Service Account authorization
#
project: "your_project_name"
project: "your-project-name"
service_account_email_address: "123-a5gt@developer.gserviceaccount.com"
service_account_private_key: "/path/to/your/NEW.pem"
@ -98,6 +98,9 @@ Set up the cloud config at ``/etc/salt/cloud``:
provider: gce
.. note::
The value provided for ``project`` must not contain underscores or spaces.
Cloud Profiles