Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	docstore/drivertest/drivertest.go
#	docstore/gcpfirestore/testdata/TestConformance/ActionsOnStructNoRev.replay
#	docstore/gcpfirestore/testdata/TestConformance/ActionsWithCompositeID.replay
#	docstore/gcpfirestore/testdata/TestConformance/As/verify_As.replay
#	docstore/gcpfirestore/testdata/TestConformance/As/verify_As_returns_false_when_passed_nil.replay
#	docstore/gcpfirestore/testdata/TestConformance/BeforeDo.replay
#	docstore/gcpfirestore/testdata/TestConformance/BeforeQuery.replay
#	docstore/gcpfirestore/testdata/TestConformance/Create.replay
#	docstore/gcpfirestore/testdata/TestConformance/Data.replay
#	docstore/gcpfirestore/testdata/TestConformance/Delete.replay
#	docstore/gcpfirestore/testdata/TestConformance/ExampleInDoc.replay
#	docstore/gcpfirestore/testdata/TestConformance/Get.replay
#	docstore/gcpfirestore/testdata/TestConformance/GetQuery.replay
#	docstore/gcpfirestore/testdata/TestConformance/GetQueryKeyField.replay
#	docstore/gcpfirestore/testdata/TestConformance/MultipleActions.replay
#	docstore/gcpfirestore/testdata/TestConformance/Proto.replay
#	docstore/gcpfirestore/testdata/TestConformance/Put.replay
#	docstore/gcpfirestore/testdata/TestConformance/Replace.replay
#	docstore/gcpfirestore/testdata/TestConformance/SerializeRevision.replay
#	docstore/gcpfirestore/testdata/TestConformance/Update.replay
#	docstore/query.go
  • Loading branch information
ybourgery committed Aug 12, 2024
2 parents 864a719 + d245f10 commit ad4b799
Show file tree
Hide file tree
Showing 628 changed files with 22,904 additions and 22,650 deletions.
8 changes: 4 additions & 4 deletions blob/gcsblob/testdata/TestBeforeReadNonExistentKey.replay

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions blob/gcsblob/testdata/TestConformance/TestAttributes.replay

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ad4b799

Please sign in to comment.