* Ignore port number match for protocol other than tcp and udp.
* Test case for same
If admin_token is not specified in api_server.conf, let the default be None
shared net support. Diff from Ajay. Todo: Handle resetting the shared flag. Floating ip allocation from horizon
Merge pull request #552 from Juniper/shared_net

shared net support. Diff from Ajay. Todo: Handle resetting the shared fl...
Merge pull request #553 from Juniper/ted-novenv

Adding discovery entry point and conf
Merge pull request #544 from naveen-n/master

* Ignore port number match for protocol other than tcp and udp.
Merge pull request #548 from Juniper/praneet_defadmintoken

If admin_token is not specified in api_server.conf, let the default be N...
Fix a typo that was causing ingress acl to not get updated
1. Add database operation and error statistics to cdb
2. Cleanup cdb library code
3. Cleanup generator message statistics
4. Added test in cdb and viz message for the same
Merge pull request #557 from Juniper/meghb_cdb_stats_and_cleanup

1. Add database operation and error statistics to cdb
Added contrail-svc-monitor
Merge branch 'master' into ted-novenv