Merge remote-tracking branch 'gcp/master'

Signed-off-by: Sam Levenick <[email protected]>
inspec · May 5, 2020 · d84e8d3 · d84e8d3
2 parents 3195fbb + 6363f09
commit d84e8d3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,15 @@
 # Change Log
-<!-- latest_release 1.3.0 -->
+<!-- latest_release 1.4.0 -->
+## [v1.4.0](https://github.com/inspec/inspec-gcp/tree/v1.4.0) (2020-04-28)
+
+#### Merged Pull Requests
+- SQL labels, MM updates [#254](https://github.com/inspec/inspec-gcp/pull/254) ([slevenick](https://github.com/slevenick))
+<!-- latest_release -->
+
 ## [v1.3.0](https://github.com/inspec/inspec-gcp/tree/v1.3.0) (2020-04-17)
 
 #### Merged Pull Requests
 - Add encryption, retention policy to buckets (#3384) (#382) [#250](https://github.com/inspec/inspec-gcp/pull/250) ([slevenick](https://github.com/slevenick))
-<!-- latest_release -->
 
 ## [v1.2.0](https://github.com/inspec/inspec-gcp/tree/v1.2.0) (2020-04-16)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.0
+1.4.0
diff --git a/docs/resources/google_compute_backend_service.md b/docs/resources/google_compute_backend_service.md
@@ -146,6 +146,7 @@ Properties that can be accessed from the `google_compute_backend_service` resour
     * INTERNAL_SELF_MANAGED
 
   * `locality_lb_policy`: The load balancing algorithm used within the scope of the locality. The possible values are -  ROUND_ROBIN - This is a simple policy in which each healthy backend               is selected in round robin order.  LEAST_REQUEST - An O(1) algorithm which selects two random healthy                 hosts and picks the host which has fewer active requests.  RING_HASH - The ring/modulo hash load balancer implements consistent             hashing to backends. The algorithm has the property that the             addition/removal of a host from a set of N hosts only affects             1/N of the requests.  RANDOM - The load balancer selects a random healthy host.  ORIGINAL_DESTINATION - Backend host is selected based on the client                        connection metadata, i.e., connections are opened                        to the same address as the destination address of                        the incoming connection before the connection                        was redirected to the load balancer.  MAGLEV - used as a drop in replacement for the ring hash load balancer.          Maglev is not as stable as ring hash but has faster table lookup          build times and host selection times. For more information about          Maglev, refer to https://ai.google/research/pubs/pub44824  This field is applicable only when the load_balancing_scheme is set to INTERNAL_SELF_MANAGED.
+
   Possible values:
     * ROUND_ROBIN
     * LEAST_REQUEST

diff --git a/docs/resources/google_compute_region_backend_service.md b/docs/resources/google_compute_region_backend_service.md
@@ -124,6 +124,7 @@ Properties that can be accessed from the `google_compute_region_backend_service`
     * INTERNAL_MANAGED
 
   * `locality_lb_policy`: The load balancing algorithm used within the scope of the locality. The possible values are -  ROUND_ROBIN - This is a simple policy in which each healthy backend               is selected in round robin order.  LEAST_REQUEST - An O(1) algorithm which selects two random healthy                 hosts and picks the host which has fewer active requests.  RING_HASH - The ring/modulo hash load balancer implements consistent             hashing to backends. The algorithm has the property that the             addition/removal of a host from a set of N hosts only affects             1/N of the requests.  RANDOM - The load balancer selects a random healthy host.  ORIGINAL_DESTINATION - Backend host is selected based on the client                        connection metadata, i.e., connections are opened                        to the same address as the destination address of                        the incoming connection before the connection                        was redirected to the load balancer.  MAGLEV - used as a drop in replacement for the ring hash load balancer.          Maglev is not as stable as ring hash but has faster table lookup          build times and host selection times. For more information about          Maglev, refer to https://ai.google/research/pubs/pub44824  This field is applicable only when the `load_balancing_scheme` is set to INTERNAL_MANAGED and the `protocol` is set to HTTP, HTTPS, or HTTP2.
+
   Possible values:
     * ROUND_ROBIN
     * LEAST_REQUEST

diff --git a/inspec.yml b/inspec.yml
@@ -4,7 +4,7 @@ maintainer: [email protected],[email protected]
 summary: This resource pack provides compliance resources_old_ignore for Google Cloud Platform
 copyright: [email protected],[email protected]
 copyright_email: [email protected],[email protected]
-version: 1.3.0
+version: 1.4.0
 license: Apache-2.0
 inspec_version: '>= 4.7.3' 
 supports: