From: Alexis de Talhouët <alexis.de_talhouet@bell.ca>
Date: Tue, 4 Dec 2018 12:56:59 +0000 (+0000)
Subject: Merge "update DFC tag to 1.1.0 for master branch"
X-Git-Tag: 4.0.0-ONAP~467
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b205843ff0c534a1be0009f1b7538c517a6d8d7e;hp=-c;p=oom.git

Merge "update DFC tag to 1.1.0 for master branch"
---

b205843ff0c534a1be0009f1b7538c517a6d8d7e
diff --combined kubernetes/aai/charts/aai-sparky-be/values.yaml
index 0f8e9eb6af,e3edcf6e58..102e800030
--- a/kubernetes/aai/charts/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/values.yaml
@@@ -37,7 -37,7 +37,7 @@@ ubuntuInitImage: oomk8s/ubuntu-init:2.0
  # application configuration
  config:
    elasticsearchHttpPort: 9200
-   gerritBranch: master
+   gerritBranch: 3.0.0-ONAP
    gerritProject: http://gerrit.onap.org/r/aai/test-config
    portalUsername: aaiui
    portalPassword: 1t2v1vfv1unz1vgz1t3b
@@@ -90,8 -90,8 +90,8 @@@ resources
        cpu: 2
        memory: 4Gi
      requests:
 -      cpu: 2
 -      memory: 4Gi
 +      cpu: 0.25
 +      memory: 1Gi
    large:
      limits:
        cpu: 4