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

Commit bcfabcd

Browse files
committed
Merge pull request #154 from dhalperi/backport-49
Backport apache/beam#49
2 parents 69b9a09 + f16cbb1 commit bcfabcd

File tree

3 files changed

+46
-1
lines changed

3 files changed

+46
-1
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/*
2+
* Copyright (C) 2015 Google Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*/
16+
17+
/**
18+
* Defines a {@link com.google.cloud.dataflow.sdk.coders.Coder}
19+
* for Protocol Buffers messages, {@code ProtoCoder}.
20+
*
21+
* @see com.google.cloud.dataflow.sdk.coders.protobuf.ProtoCoder
22+
*/
23+
package com.google.cloud.dataflow.sdk.coders.protobuf;

sdk/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
* <h3>Reading from Cloud Bigtable</h3>
7373
*
7474
* <p>The Bigtable source returns a set of rows from a single table, returning a
75-
* {@code PCollection&lt;Row&gt;}.
75+
* {@code PCollection<Row>}.
7676
*
7777
* <p>To configure a Cloud Bigtable source, you must supply a table id and a {@link BigtableOptions}
7878
* or builder configured with the project and other information necessary to identify the
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright (C) 2015 Google Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*/
16+
17+
/**
18+
* Defines transforms for reading and writing from Google Cloud Bigtable.
19+
*
20+
* @see com.google.cloud.dataflow.sdk.io.bigtable.BigtableIO
21+
*/
22+
package com.google.cloud.dataflow.sdk.io.bigtable;

0 commit comments

Comments
 (0)