Fix more merge conflicts
[osm/SO.git] / rwcm /
2017-02-23 Philip JosephFix merge from master conflicts 72/1172/1
2017-02-23 Philip JosephFix merge conflicts 71/1171/1
2017-02-23 Philip JosephNew feature: Support for ping pong charm 70/1170/1
2017-02-23 Philip JosephNew Feature: VCA config parameter request and source 68/1168/1
2017-02-23 Philip JosephAdd VCA details to input file for NS initial-config... 63/1163/1
2017-02-06 Philip JosephMerge v1.1 to master_vca_intg 68/1068/1
2017-01-30 Philip JosephBug 190 : Pipe the stdout and stderr, when calling... 44/1044/1
2017-01-25 Philip JosephBug 172 Fix service primitive exec failure 21/1021/1
2017-01-17 Philip JosephBug 153 : Initial config primitive error 58/958/1
2017-01-12 Michael Marchetti - Fix for getting vnfd id, no object named vnfd_ref. 42/942/1
2017-01-12 Philip JosephFix merge conflicts 29/929/1
2017-01-11 Philip JosephMerge from master 28/928/1
2017-01-10 Philip JosephNew feature: Support for ping pong charm 01/901/1
2017-01-09 velandyMerge "Minor fix for file mime difference in ubuntu"
2017-01-09 velandyMerge "Bug 140"
2017-01-06 velandyMerge branch 'pkg_mgmt' 88/888/1
2017-01-04 velandy141 - Support for Package Management in SO
2016-12-30 Philip JosephMinor fix for VCA config parameter 65/865/1
2016-12-29 Philip JosephNew Feature: VCA config parameter request and source 60/860/1
2016-12-23 Jeremy Mordkoffmerge from v1.0
2016-12-23 Jeremy MordkoffMerge branch 'v1.0'
2016-12-23 Jeremy MordkoffMerge branch 'v1.0'
2016-12-23 Jeremy MordkoffMerge branch 'v1.0'
2016-12-23 Jeremy MordkoffMerge branch 'v1.0'
2016-12-23 Jeremy MordkoffMerge branch 'v1.0'
2016-12-17 velandyMerge branch 'v1.0' 11/811/1
2016-12-14 Rajesh VelandyMerge branch 'v1.0' 88/788/1
2016-11-30 Ananda BaitharuBug 113 add VNFD copy to VNFR 09/709/2
2016-09-30 Philip JosephFix blocking call to execute service primitive 54/454/1
2016-09-30 velandyMerge "Revert "Functional spec for cloud-init support""
2016-09-30 velandyMerge "CLI for OSM"
2016-09-26 RajeshMerge "Added -H option to BUILD.sh launchpad instruction"
2016-09-26 Philip JosephFix for service primitive execution and status 90/390/1
2016-09-23 Philip JosephBug 54 : Fix PE NS instantiation error 86/386/1
2016-09-22 Philip JosephBug 48: SO crash due to service primitive 75/375/1
2016-09-07 Jeremy MordkoffRIFT OSM R1 Initial Submission 86/286/1