Project Calico version 2014.1-0ubuntu1-calico0.2
Merge pull request #1 from Metaswitch/dhcp-interface

Correctly set the subnet mask on the interfaces used by DHCP.
Remove packaging changes from master branch

The plan from now on, for the calico-nova and calico-neutron
repositories, is that the master branch will only contain
Calico-related OpenStack code changes.  There will be separate
branches for Ubuntu and Red Hat packaging, and we will merge the
master branch into those before preparing new package releases.
Accept flat networks in the Neutron metadata agent

The Neutron metadata agent implicitly expects nested networks
by requiring that it have either a router ID or a network ID. In
flat networks (like the one set up by Calico), one metadata agent
may serve ports on multiple networks and without OpenStack
routers.

This patch allows the metadata agent (and the namespace proxy) to
function in a network that does not use virtual layer 2 networks,
by relying on the fact that in such an OpenStack deployment IP
addresses will be unique across the data center.
Must be passed a UUID on the command line.
Merge pull request #2 from Metaswitch/metadata

Patch the metadata agent and proxy to function in flat networks
Merge branch 'master' into ubuntu