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

PAYARA-628 Move Hazelcast and JBatch configuration into the tree view #903

Merged
merged 10 commits into from Jul 11, 2016

Conversation

MeroRai
Copy link
Member

@MeroRai MeroRai commented Jul 6, 2016

No description provided.

@MeroRai MeroRai changed the title Payara 628 PAYARA-628 Move Hazelcast and JBatch configuration into the tree view Jul 6, 2016
@smillidge
Copy link
Contributor

Jenkins test please

@payara-ci
Copy link
Contributor

All tests have passed

@mulderbaba
Copy link
Contributor

@MeroRai can you resolve the conflicts in your branch?

Conflicts:
	appserver/admingui/payara-console-extras/src/main/resources/META-INF/admingui/console-config.xml
@MeroRai
Copy link
Member Author

MeroRai commented Jul 11, 2016

Jenkins test please

@payara-ci
Copy link
Contributor

All tests have passed

@smillidge smillidge merged commit d8b2dbf into payara:master Jul 11, 2016
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

5 participants