UDP support for multicast
Send vxlan in multicast route to support vxlan header creation for multicast traffic
Change const pointer to const reference
Add valid label flags for l2 multicast route
Fix the get of DNS xmpp peer
Fix conflict while merging
Delete the associated reverse flow while deleting a short flow, as reverse
flow and forward flow should always co-exist, unless created due to Audit.
update heartbeat timestamp in case publisher has rebooted and hasn't sent any heartbeat yet
Merge pull request #17 from manishsing/master

UDP encapsulation in multicast and vxlan id in multicast route addition
Change version to 1.03
Merge pull request #30 from ashoksr/master

Change version to 1.03
Interface code refactoring for interface. (One more commit pending)
- Split header files
- Split code for vm-interface to a new file
- Rename interface class
Pick active flow count from flow tree size instead of incrementing/decrementing flow count during flow add/delete.
Merge pull request #29 from Juniper/sb

schema changes to support policy based service chains and some schema tr...
Merge pull request #32 from Juniper/sb

Bug 2051: After migration to zookeeper for address management, while mov...
This bug is opened to provide relative query start time and end time. The relative time can take values in the following format:
Now, now+10s,now+10m,now+10h,now-10s,now-10m,now-10h.
Diff Dummary:
1) We are retaining the same "start_time" and "end_time" to specify even the relative time 2)In opserver.py, start_time and end_time and converted to int in redis_query_status().Change has been made to retain them as string.
3) change has been made in calculation of time_slice. ^ operator was used instead of power() for exponent calculation, so replaced that as well.
Merge pull request #28 from Juniper/bug1935

update heartbeat timestamp in case publisher has rebooted and hasn't sen...
Merge pull request #33 from Juniper/development1

This bug is opened to provide relative query start time and end time. Th...
Patch in:

commit a9e6a9a7c028f328d201b1e68a309e7258c0f3d2
Author: Megh Bhatt <meghb@juniper.net>
Date:   Fri Nov 22 01:11:33 2013 -0800

    1. Remove code that looks at column name to determine the data type
       stored in cassandra in query engine.
    2. Install contrail-nodemgr in the control, config, analytics,
       and vrouter venv from the respective rpms instead of from
       the supervisor rpm to support upgrade of individual
       rpms
Merge remote-tracking branch 'upstream/master'