Merge branch 'master' into bq-date

feast-dev · Dec 17, 2021 · 45c73ef · 45c73ef
2 parents 1510894 + 5ce0fdb
commit 45c73ef
Show file tree

Hide file tree

Showing 40 changed files with 824 additions and 1,372 deletions.
diff --git a/.github/workflows/pr_integration_tests.yml b/.github/workflows/pr_integration_tests.yml
@@ -161,11 +161,3 @@ jobs:
           env_vars: OS,PYTHON
           fail_ci_if_error: true
           verbose: true
-      - name: Benchmark python
-        env:
-          FEAST_SERVER_DOCKER_IMAGE_TAG: ${{ needs.build-docker-image.outputs.DOCKER_IMAGE_TAG }}
-          FEAST_USAGE: "False"
-          IS_TEST: "True"
-        run: pytest --verbose --color=yes sdk/python/tests --integration --benchmark --benchmark-autosave --benchmark-save-data --durations=5
-      - name: Upload Benchmark Artifact to S3
-        run: aws s3 cp --recursive .benchmarks s3://feast-ci-pytest-benchmarks
diff --git a/docs/concepts/architecture.md b/docs/concepts/architecture.md
diff --git a/docs/concepts/entities.md b/docs/concepts/entities.md
diff --git a/docs/concepts/feature-tables.md b/docs/concepts/feature-tables.md
diff --git a/docs/concepts/feature-views.md b/docs/concepts/feature-views.md
diff --git a/docs/concepts/glossary.md b/docs/concepts/glossary.md
diff --git a/docs/concepts/sources.md b/docs/concepts/sources.md
diff --git a/docs/concepts/stores.md b/docs/concepts/stores.md
diff --git a/docs/how-to-guides/creating-a-custom-provider.md b/docs/how-to-guides/creating-a-custom-provider.md
@@ -123,7 +123,7 @@ It may also be necessary to add the module root path to your `PYTHONPATH` as fol
 PYTHONPATH=$PYTHONPATH:/home/my_user/my_custom_provider feast apply
 ```
 
-That's it. You should not have a fully functional custom provider!
+That's it. You should now have a fully functional custom provider!
 
 ### Next steps
 

diff --git a/java/pom.xml b/java/pom.xml
@@ -59,7 +59,7 @@
         <!-- OpenCensus is used in grpc and Google's HTTP client libs in Cloud SDKs -->
         <opencensus.version>0.26.0</opencensus.version>
         <!-- Force log4j2 to 2.11+ to support objectMessageAsJsonObject -->
-        <log4jVersion>2.15.0</log4jVersion>
+        <log4jVersion>2.16.0</log4jVersion>
         <joda.time.version>2.9.9</joda.time.version>
         <jakarta.validation.api.version>2.0.2</jakarta.validation.api.version>
         <spring.security.oauth2.version>2.5.0.RELEASE</spring.security.oauth2.version>