Merge "Fix contrail-status for python 2.6 - centos. Also handle socket.timeout exception in addition to requests.Timeout, CI systest failed due to the unhandled exception."
Merge "Fix tenant_id filtering"
Merge "Add availability zone enable/disable support in service template. Also check if svc_monitor conf has availability zone"
As we are now using flow handle as the key for flow ksync entry,
We need to trigger update Ksync Entry on flow handle change
Also avoid invalidating the flow handle in case of EBADF, since it
will result can result in new index allocation from kernel.

Fixes BUG: #1360030

Change-Id: I8174efbb35c36c3a690b61b6520f2847bf15495f
Merge "enable consistently passing UTs"
enabling consistently passing test_integration

Change-Id: Icd589ef37b0724aa7847ee5e5fbc1d0dd704f150
Don't try to extend list with None leading to bug 1360074.

Change-Id: I08a2614efff8c50b7fc4ea3445b1e8c1c64aff08
Fixes-bug: 1360074
Merge "Loadbalancer fixes and whitelist changes"
Merge "[SVC monitor] Fix some introspect and UVE bugs"
1. Separate out TcpServerManager into a templatized ServerManager that
   is used by both TcpServer and UdpServer since UdpServer was storing
   raw pointers in boost::asio and needed the same functionality.
2. Change SyslogListeners to use composition for SyslogTcpListener, and
   SyslogUDPListener instead of multiple inheritance. Move syslog_test
   from flaky to running in analytics.
3. Add ScheduleShutdown() to WorkQueue which can be called from any
   context and which sets a boolean to perform the WorkQueue
   shutdown on exit from the current runner if it is running. If current
   runner is not running, then it will shutdown the WorkQueue in the same
   context. Added boolean to control if the Shutdown()/ScheduleShutdown()
   routine deletes the entry from the queue.

Change-Id: If90fd277f2e4af6ad3dfa0d9c1d95c649eef014a
Merge "Enable netns script in agent configuration"
Change direction for loadbalancer whitelist to ensure all LB objects are traversed in the graph

Change-Id: I4dd8036babc7409786297d277eeaf8dbef12c2ed
Api Library should handle unknown types from a server (that has a
newer version) gracefully.

Change-Id: Ib6da98b11080f05327221421ebc35fa313efccd7
Merge "1. Separate out TcpServerManager into a templatized ServerManager that    is used by both TcpServer and UdpServer since UdpServer was storing    raw pointers in boost::asio and needed the same functionality. 2. Change SyslogListeners to use composition for SyslogTcpListener, and    SyslogUDPListener instead of multiple inheritance. Move syslog_test    from flaky to running in analytics. 3. Add ScheduleShutdown() to WorkQueue which can be called from any    context and which sets a boolean to perform the WorkQueue    shutdown on exit from the current runner if it is running. If current    runner is not running, then it will shutdown the WorkQueue in the same    context. Added boolean to control if the Shutdown()/ScheduleShutdown()    routine deletes the entry from the queue."
Merge "Don't try to extend list with None leading to bug 1360074."
Merge "* Upon deactivation of floating ip and service vlan, release the   reference to vrf, so that vrf deletion can proceed. * Test case for same Closes-bug: #1359320"
Merge "* Set tunnel for vlan route to mpls only, if vxlan was enabled   then agent was publishing the route with mpls label 0."
Merge "* Pickup nat destination vrf as source vrf for setting egress composite   NH, while DNAT is happening. * Test case for same"
Merge "Change direction for loadbalancer whitelist to ensure all LB objects are traversed in the graph"
Merge "Api Library should handle unknown types from a server (that has a newer version) gracefully."