summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuifeng(Victor) HU <huruifeng@huawei.com>2015-03-26 02:00:21 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-03-26 02:00:21 +0000
commit7450cb17431641f31632b17f67f82a3e30a3b454 (patch)
treea3d8eb49029e919b0b13c9513f57efb2ca807505
parent8b7d3657bd5fd4fa363042db4abf7fc5388a4447 (diff)
parent5951e516cb37dc63bbf7c5edbce71b77f510eb5e (diff)
Merge changes Icee1e8b6,I13e237d5
* changes: Remove whitespace in new line Add INFO file for inclusion on the wiki
-rw-r--r--INFO22
-rw-r--r--LICENSE6
2 files changed, 25 insertions, 3 deletions
diff --git a/INFO b/INFO
new file mode 100644
index 0000000..8cec229
--- /dev/null
+++ b/INFO
@@ -0,0 +1,22 @@
+Project: Deployment Template Translation (Parser)
+Creation Date: February 4, 2015
+Category: Integration & Testing
+Lifecycle State: Incubation
+Primary Contact: huangzhipeng@huawei.com
+Project Lead: huangzhipeng@huawei.com
+Jira Project Name: Deployment Template Translation Project
+Jira Project Prefix: PARSER
+Mailing list tag: [parser]
+Repository: parser
+
+Committers:
+huruifeng@huawei.com
+huangzhipeng@huawei.com
+zhouqi5@huawei.com
+vinayak.ram@hp.com
+sarbajit.chatterjee@hp.com
+senthil-kumar.subramaniam@hp.com
+zhang.jun3g@zte.com.cn
+
+Link to TSC approval of the project: http://meetbot.opnfv.org/meetings/opnfv-meeting/
+Link(s) to approval of additional submitters:
diff --git a/LICENSE b/LICENSE
index eab0924..f4346f8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,11 +1,11 @@
Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.