Skip to content

Commit 87f72db

Browse files
MaxrovrMaxrovr
committed
Resolving conflicts from rollback testing
2 parents 8221547 + ca170aa commit 87f72db

File tree

3,767 files changed

+15106
-3819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,767 files changed

+15106
-3819
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 3 deletions

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion

‎GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
22

33
TEST?=./...
44
GOFMT_FILES?=$(if $(SERVICE), $$(find . -name '$(SERVICE)*.go' |grep -v vendor), $$(find . -name '*.go' |grep -v vendor))

‎examples/adm/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
22
// Licensed under the Mozilla Public License v2.0
33

44
variable "tenancy_ocid" {}

‎examples/aiAnomalyDetection/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
22
// Licensed under the Mozilla Public License v2.0
33

44
// These variables would commonly be defined as environment variables or sourced in a .env file

‎examples/always_free/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
22
// Licensed under the Mozilla Public License v2.0
33

44
variable "tenancy_ocid" {

‎examples/analytics/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
22
// Licensed under the Mozilla Public License v2.0
33

44

‎examples/analytics/subnet.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
22
// Licensed under the Mozilla Public License v2.0
33

44
resource "oci_core_vcn" "test_vcn" {

‎examples/announcements_service/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
22
// Licensed under the Mozilla Public License v2.0
33

44
variable "tenancy_ocid" {}

‎examples/announcements_service/tag_namespace.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
22
// Licensed under the Mozilla Public License v2.0
33

44
variable "tag_namespace_description" {

0 commit comments

Comments
 (0)