Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manual merge of master into xovis branch #145

Merged
merged 5 commits into from Jun 29, 2014

Conversation

tim-moody
Copy link
Contributor

No description provided.

@tim-moody
Copy link
Contributor Author

This PR supersedes PR 126 and 144 and merges in the changes to xovis and the changes to the xsce structure.

N.B. That an existing xovis database is deleted. And the delete step ignores errors in case the database does not exist.

N.B. That the admin password is admin and should be changed.

The variables have been placed in vars/default_vars.yml, where they should be overridden until we get a better home for them.

tim-moody added a commit that referenced this pull request Jun 29, 2014
@tim-moody tim-moody merged commit 3082783 into XSCE:master Jun 29, 2014

For information on the xovis feature see https://github.com/martasd/xovis/blob/master/README.md.

Links to Services
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tim-moody Why is this section called 'Links to Services'? Where are the links?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copy paste error: should be Parameters.

Tim

From: Martin Dluhos
Sent: Thursday, July 03, 2014 9:41 AM
To: XSCE/xsce
Cc: Tim Moody
Subject: Re: [xsce] Manual merge of master into xovis branch (#145)

In roles/xovis/README.rst:

@@ -0,0 +1,25 @@
+============
+xovis README
+============
+
+For information on the xovis feature see https://github.com/martasd/xovis/blob/master/README.md.
+
+Links to Services
@tim-moody Why is this section called 'Links to Services'? Where are the links?


Reply to this email directly or view it on GitHub.

@tim-moody tim-moody deleted the xovis-again branch July 4, 2014 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants