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

CONJ-496 #108

Closed
wants to merge 5 commits into from
Closed

CONJ-496 #108

wants to merge 5 commits into from

Conversation

krisiye
Copy link
Contributor

@krisiye krisiye commented Jun 22, 2017

No description provided.

@krisiye krisiye changed the title Conj 496 CONJ-496 Jun 22, 2017
@rusher
Copy link
Collaborator

rusher commented Jun 23, 2017

Hi @krisiye ,

Good contribution.

This will be added to next correction version (2.0.3).

Similar to other open source projects, the MariaDB Foundation needs to have shared ownership of all code that is included in the MariaDB distribution. The easiest way to achieve this is by submitting your code under the BSD-new license. (The other alternative is to sign the code contribution agreement which can be found here: https://mariadb.com/kb/en/mariadb/mca/)

Please indicate in a comment below that you are contributing your new code of the whole pull request, including one or several files that are either new files or modified ones, under the BSD-new license or that you have filled out the contribution agreement and sent it.

Thanks,
diego

@krisiye
Copy link
Contributor Author

krisiye commented Jun 23, 2017

I am contributing the new code of the whole pull request, including one or several files that are either new files or modified ones, under the BSD-new license.

@krisiye
Copy link
Contributor Author

krisiye commented Jun 23, 2017

@rusher - Do we know if we would also get a 1.6.2 (java 7) released with this update?

@rusher
Copy link
Collaborator

rusher commented Jun 23, 2017

A java 7 version will be released too (1.6.2)

@krisiye
Copy link
Contributor Author

krisiye commented Jun 23, 2017

Also noticed below that appveyor checks and travis-ci (on the max-scale tests) were failing on code thats unrelated to this PR. Is that ok to leave it that way?

@rusher
Copy link
Collaborator

rusher commented Jun 23, 2017

i've seen that and that will be corrected during merge.

@krisiye
Copy link
Contributor Author

krisiye commented Jun 23, 2017

Thanks. Also if you have any ETA for the releases that will be helpful. I could also work with a SNAPSHOT if the releases will take longer.

@rusher
Copy link
Collaborator

rusher commented Jun 26, 2017

Release will be done tomorrow

@krisiye
Copy link
Contributor Author

krisiye commented Jun 26, 2017

@rusher - thanks for the info. Let me know if you want me to PR against develop or a different branch just in case.

@krisiye
Copy link
Contributor Author

krisiye commented Jun 27, 2017

@rusher - This PR was not merged, and i also see a release done for 1.6.2/2.0.3 which does not include this. Not sure why. any idea?

@sfahrenholz
Copy link

@krisiye The PR is in the release, see e341196
He using an other workflow maybe for merging (PR into local branch > quash all to remote branch), but i dont know it really

@krisiye
Copy link
Contributor Author

krisiye commented Jun 27, 2017

@sfahrenholz - The PR was merged to develop but that was after the release. JIRA is updated. The new targets are 2.1.0, 1.6.3. We have a 2.1.0-SNAPSHOT and 1.6.3-SNAPSHOT available now.

@krisiye
Copy link
Contributor Author

krisiye commented Jul 5, 2017

@rusher - I updated the PR for the comments and opened another #109 against develop since this is already on develop. Let me know if you would like me to close this one out.

@krisiye
Copy link
Contributor Author

krisiye commented Jul 6, 2017

Closing since commits from this PR were merged to develop instead.

@krisiye krisiye closed this Jul 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants