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

Fix branch inconsistency #472

Merged

Conversation

khorshuheng
Copy link
Collaborator

This PR back port bug fixes from master branch back to branch v0.4 (up to release 0.4.4). The commit differences were generated via: git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative v0.4-branch..v0.4.4

Patches to be included in v0.4.5 will be committed via another PR.

The commits which has been cherry picked:

These commits will be left out:

woop and others added 11 commits February 13, 2020 11:14
* Initial commit of changelog up to 0.4.3

* Remove unreleased changes on master

* Add missing changelog manually

Co-authored-by: Khor Shu Heng <32997938+khorshuheng@users.noreply.github.com>
Rather than the Maven protobuf plugin running on the same symlinked
definitions in several Java modules, localize this process into one
module that the others depend on.

This provides a single module that can be depended on by third-party
extensions with the bare minimum of dependencies.

Also removes proto files that are no longer used.
* Add documentation for bigquery batch retrieval

* Fix formatting for multiline comments
This forward-ports a straggling commit from feast-dev#407: it was missed when
initially creating the datatypes module because Sonatype publishing
setup was added concurrently.
Allow log level to be set via environmental variable.
Add ability to set appender type in serving.
Remove logback-classic from ingestion as it is a library so should not bring its own impl.
Upgrade log4j to 2.12.1 to support objectMessageAsJsonObject.
Fix logger config targeting feast package in serving an add same concept for core.
* Update Changelog

* Remove closed issues
@feast-ci-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: khorshuheng
To complete the pull request process, please assign woop
You can assign the PR to them by writing /assign @woop in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@davidheryanto
Copy link
Collaborator

/retest

@feast-dev feast-dev deleted a comment from feast-ci-bot Feb 13, 2020
@davidheryanto
Copy link
Collaborator

/retest

@davidheryanto
Copy link
Collaborator

davidheryanto commented Feb 13, 2020

All tests for Java 8 related passed. Merging manually because the failing tests are for java 11 when the prow config has not been updated to igore those tests

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants