Fix rebased conflicts from master 75/24375/7
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Thu, 12 Oct 2017 03:23:57 +0000 (08:53 +0530)
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Mon, 20 Nov 2017 08:33:07 +0000 (14:03 +0530)
commit14880ec3b183f52ea3f3fea460adf807c8643b70
treeb31ea050a710686ed6113eca7431b36dbe5ef349
parenta96cd9cbb9b23f4b7ad4e051a5dad7602ac967f0
Fix rebased conflicts from master

Issue-Id: CLI-66

Change-Id: I1cc275c2794d9c7e4b951f648eb8cc1e569973c5
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
deployment/docker/src/main/docker/Dockerfile
main/src/main/resources/oclip-readme.txt [moved from main/src/main/resources/onap-readme.txt with 100% similarity]
validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java