Merge branch 'master' into timeout-increase

Azure · Oct 15, 2019 · 75b0830 · 75b0830
2 parents 39e9298 + da7916c
commit 75b0830
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -5,6 +5,9 @@ If this PR closes another issue, add 'closes #<issue number>' somewhere in the P
 
 **Special notes for your reviewer**:
 
+**How does this PR make you feel**:
+![gif](https://giphy.com/)
+
 **If applicable**:
 - [ ] this PR contains documentation
 - [ ] this PR contains tests
diff --git a/examples/demo/azure-vote-app-redis.yaml b/examples/demo/azure-vote-app-redis.yaml
@@ -1,4 +1,4 @@
-apiVersion: azure.microsoft.com/v1alpha1alpha1
+apiVersion: azure.microsoft.com/v1alpha1
 kind: RedisCache
 metadata:
   name: azure-redis