Skip to content

Commit bb64748

Browse files
sduskissduskis
committed
Merge branch 'master' into autosynth-bigquerydatatransfer
2 parents 5758ea6 + 4123f48 commit bb64748

9 files changed

Lines changed: 824 additions & 787 deletions

File tree

‎google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ByteContentItem.java‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java‎

Lines changed: 775 additions & 775 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java‎

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FileType.java‎

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,8 @@ message ByteContentItem {
569569
IMAGE_SVG = 4;
570570

571571
TEXT_UTF8 = 5;
572+
573+
AVRO = 11;
572574
}
573575

574576
// The type of data stored in the bytes string. Default will be TEXT_UTF8.

‎google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/storage.proto‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,10 @@ enum FileType {
520520
// bmp, gif, jpg, jpeg, jpe, png.
521521
// bytes_limit_per_file has no effect on image files.
522522
IMAGE = 3;
523+
524+
// Included file extensions:
525+
// avro
526+
AVRO = 7;
523527
}
524528

525529
// Row key for identifying a record in BigQuery table.

‎google-cloud-clients/google-cloud-dlp/synth.metadata‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"updateTime": "2019-06-06T07:44:01.009668Z",
2+
"updateTime": "2019-06-18T07:43:21.912360Z",
33
"sources": [
44
{
55
"generator": {
66
"name": "artman",
7-
"version": "0.22.0",
8-
"dockerImage": "googleapis/artman@sha256:72f6287a42490bfe1609aed491f29411af21df3f744199fe8bb8d276c1fdf419"
7+
"version": "0.27.0",
8+
"dockerImage": "googleapis/artman@sha256:b036a7f4278d9deb5796f065e5c7f608d47d75369985ca7ab5039998120e972d"
99
}
1010
},
1111
{
1212
"git": {
1313
"name": "googleapis",
1414
"remote": "https://github.com/googleapis/googleapis.git",
15-
"sha": "17ed79ade5047270c92dadabd3fc3e610267e0b5",
16-
"internalRef": "251754861"
15+
"sha": "384aa843867c4d17756d14a01f047b6368494d32",
16+
"internalRef": "253675319"
1717
}
1818
}
1919
],

‎google-cloud-clients/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
<dependency>
228228
<groupId>com.google.apis</groupId>
229229
<artifactId>google-api-services-compute</artifactId>
230-
<version>v1-rev20190403-1.28.0</version>
230+
<version>v1-rev20190530-1.28.0</version>
231231
</dependency>
232232
<dependency>
233233
<groupId>com.google.cloud.datastore</groupId>

‎google-cloud-testing/google-cloud-gcloud-maven-plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</description>
2020

2121
<properties>
22-
<maven.version>3.5.0</maven.version>
22+
<maven.version>3.6.1</maven.version>
2323
</properties>
2424

2525
<build>

0 commit comments

Comments
 (0)