Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Fix #591: overriding property from command line #623

Merged
merged 1 commit into from
Aug 23, 2016
Merged

Fix #591: overriding property from command line #623

merged 1 commit into from
Aug 23, 2016

Conversation

rlouapre
Copy link
Contributor

@rlouapre rlouapre commented Jun 26, 2016 •
edited by grtjn
Loading

@rlouapre rlouapre mentioned this pull request Jun 27, 2016
Closed
@grtjn
Copy link
Contributor

grtjn commented Jun 27, 2016

Looks clean..

@grtjn grtjn changed the title Fix #591 Fix #591: overriding property from command line Jul 15, 2016
@RobertSzkutak
Copy link
Contributor

Hello @rlouapre ! I would be happy to merge this in if you could make one change for me.

deploy/lib/server_config.rb looks good.

However the changes to the other two files deploy/test/data/ml7-properties/build.properties and deploy/test/test_server_config.rb look to be made for your own personal testing.

If you could remove your changes from these files I'd be happy to merge in this request. If you're too busy, I'm also happy to commit in only just the changes in server_config.rb so we can close out the issue.

Thanks for your PR!

@grtjn
Copy link
Contributor

grtjn commented Aug 23, 2016

I actually think they are valid additions to the self-test..

@RobertSzkutak
Copy link
Contributor

Tested out and it seems fine. Following your advice @grtjn and merging..

@RobertSzkutak RobertSzkutak merged commit 2e279b6 into marklogic-community:dev Aug 23, 2016
@grtjn grtjn added this to the 1.7.4 milestone Aug 23, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.7.4
Development

Successfully merging this pull request may close these issues.
3 participants
@rlouapre @grtjn @RobertSzkutak