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

Forward-integrate: merge master into v2 #567

Merged
merged 30 commits into from
May 5, 2017
Merged

Forward-integrate: merge master into v2 #567

merged 30 commits into from
May 5, 2017

Conversation

davorbonaci
Copy link
Contributor

No description provided.

Raghu Angadi and others added 30 commits December 13, 2016 16:59
Recent PR #491 changes how KafkaIO splits. This makes it incompatible
with Dataflow update across these two versions.
* Update version range dependency to exclude 2.0.0-betaX versions

* fixup
Increase KafkaIO version to 0.2.0
* Fix HadoopFileSource’s split size estimate

* Properly set interrupted state
…-proof

* We created a helper in BigQueryIO to create a JobConfigurationQuery capturing all options,
  but we had not yet propagated this cleanup into the Services abstraction or helper classes.

Refactor BigQueryServices and BigQueryTableRowIterator to propagate the same configuration.

Adds a new deprecated constructor to BigQueryTableRowIterator for backwards-compatibility.

This fixes #539.
Fix InProcessPipelineRunner to handle a null subscription
BigQuery: fix an issue with option propagation and refactor to future-proof
Small fix for BigtableIO's WriteOperation.finalize
DataflowPipelineJob: gracefully handle cancellation concurrent with termination
Cache result of BigQuerySourceBase.split
Makes cachedSplitResult transient in BigQuerySourceBase
@davorbonaci davorbonaci self-assigned this May 5, 2017
@davorbonaci davorbonaci requested a review from dhalperi May 5, 2017 21:51
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@dhalperi
Copy link
Contributor

dhalperi commented May 5, 2017

LGTM, please self-merge on green.

@dhalperi
Copy link
Contributor

dhalperi commented May 5, 2017

Well, it passed, so I'll merge.

@dhalperi dhalperi merged commit 10e9f86 into GoogleCloudPlatform:v2 May 5, 2017
@davorbonaci davorbonaci deleted the merge_master_into_v2 branch May 5, 2017 21:57
@dhalperi dhalperi removed their request for review May 5, 2017 21:57
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants