From: Bharath Balasubramanian <bharathb@research.att.com>
Date: Mon, 19 Mar 2018 02:18:27 +0000 (+0000)
Subject: Merge "CLM Fixes"
X-Git-Tag: v2.5.3~13
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c3831578e0d0abb97a4725d3e01e0211dbb53e87;hp=5538377ed71c1e3519a2fe7b7ee50185f4764675;p=music.git

Merge "CLM Fixes"
---

diff --git a/INFO.yaml b/INFO.yaml
new file mode 100644
index 00000000..af41ab20
--- /dev/null
+++ b/INFO.yaml
@@ -0,0 +1,52 @@
+---
+project: 'music'
+project_creation_date: '2018-01-17'
+lifecycle_state: 'Incubation'
+project_lead: &onap_releng_ptl
+    name: 'Bharath Balasubramanian'
+    email: 'bharathb@research.att.com'
+    id: 'bharathb'
+    company: 'ATT'
+    timezone: 'America/New York'
+primary_contact: *onap_releng_ptl
+issue_tracking:
+    type: 'jira'
+    url: 'https://jira.onap.org/projects/MUSIC'
+    key: 'MUSIC'
+meetings:
+    - type: 'zoom'
+        agenda: 'https://wiki.onap.org/display/DW/MUSIC+Project'
+        url: 'https://wiki.onap.org/display/DW/MUSIC+Project'
+        server: 'n/a'
+        channel: 'n/a'
+        repeats: 'weekly'
+        time: '14:00 UTC'
+committers:
+    - <<: *onap_releng_ptl
+    - name: 'Thomas Nelson'
+        email: 'tn1381@att.com'
+        company: 'ATT'
+        id: 'arthurdent3'
+        timezone: 'America/New York'
+    - name: 'Brendan Tschaen'
+        email: 'bptschaen@gmail.com'
+        company: ''
+        id: 'bptschaen'
+        timezone: ''
+    - name: 'Greg Waines'
+        email: 'greg.waines@windriver.com'
+        company: 'Windriver'
+        id: 'gwaines'
+        timezone: ''
+    - name: 'Viswanath Kumar Skand Priya'
+        email: 'viswanath.kumarskandpriya@verizon.com'
+        company: 'Verizon'
+        id: 'kspviswa-vz'
+        timezone: ''
+    - name: 'Shashank Kumar Shankar'
+        email: 'shashank.kumar.shankar@intel.com'
+        company: 'Intel'
+        id: 'shashank.kumar....'
+        timezone: 'America/Portland'
+tsc:
+    approval: 'https://lists.onap.org/pipermail/onap-tsc'
diff --git a/distributed-kv-store b/distributed-kv-store
new file mode 160000
index 00000000..086faa54
--- /dev/null
+++ b/distributed-kv-store
@@ -0,0 +1 @@
+Subproject commit 086faa54cc995f9850c0946f42a83b58fed02046
diff --git a/pom.xml b/pom.xml
index 1dfc5d3d..630c80a5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>0.1.1</version>
+        <version>1.1.0</version>
         <relativePath />
     </parent>