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

Openshift Merge #39

Merged
merged 6 commits into from
Mar 2, 2015
Merged

Openshift Merge #39

merged 6 commits into from
Mar 2, 2015

Conversation

oskopek
Copy link
Owner

@oskopek oskopek commented Mar 2, 2015

Fixes jboss deployment issues... TODO: check all local tests

Template builder and others added 6 commits March 2, 2015 04:00
Conflicts:
	.openshift/config/standalone.xml
	.openshift/cron/weekly/README
	.openshift/cron/weekly/jobs.allow
	.openshift/cron/weekly/jobs.deny
	pom.xml
oskopek added a commit that referenced this pull request Mar 2, 2015
@oskopek oskopek merged commit 964c263 into master Mar 2, 2015
@oskopek oskopek deleted the openshift-merge branch March 2, 2015 09:49
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.

1 participant