summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-09-20 13:41:12 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-20 13:41:12 +0000
commitf79b2fee2de0144ccbc6c28fdb2eff78e8117b9b (patch)
tree6e2e1abbe72c83979d278dc2c3a3e0db2f1e5598
parent6e3286203f254ff0feb0aa765f0d4f77dbc8beaf (diff)
parentfb7c18c1e9cc4008adfdc5c46b7eddc6e9f4a8b4 (diff)
Merge "updating gerritBranch to master"
-rw-r--r--kubernetes/aaf/values.yaml2
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/values.yaml2
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml2
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml2
4 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index 9a51839241..19250d8f69 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -38,7 +38,7 @@ config:
csServiceName: aaf-cass
# gerrit branch where the latest aaf/auth/sample/public code exists
gerritProject: http://gerrit.onap.org/r/aaf/authz.git
- gerritBranch: 2.0.0-ONAP
+ gerritBranch: master
# default number of instances
replicaCount: 1
diff --git a/kubernetes/aai/charts/aai-sparky-be/values.yaml b/kubernetes/aai/charts/aai-sparky-be/values.yaml
index bae842bef9..50c624da9a 100644
--- a/kubernetes/aai/charts/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/values.yaml
@@ -37,7 +37,7 @@ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
# application configuration
config:
elasticsearchHttpPort: 9200
- gerritBranch: 2.0.0-ONAP
+ gerritBranch: master
gerritProject: http://gerrit.onap.org/r/aai/test-config
portalUsername: aaiui
portalPassword: 1t2v1vfv1unz1vgz1t3b
diff --git a/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml
index ad1567d81b..3f1aa52b10 100644
--- a/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml
@@ -44,7 +44,7 @@ debugEnabled: false
# application configuration
config:
# gerrit branch where the latest code is checked in
- gerritBranch: 2.0.0-ONAP
+ gerritBranch: master
# gerrit project where the latest code is checked in
gerritProject: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git
diff --git a/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml
index 3a8a0c1da1..f63a133e48 100644
--- a/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml
@@ -40,7 +40,7 @@ debugEnabled: false
# application configuration
config:
# gerrit branch where the latest code is checked in
- gerritBranch: 2.0.0-ONAP
+ gerritBranch: master
# gerrit project where the latest code is checked in
gerritProject: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git