cleanup merge conflicts
Merge remote-tracking branch 'origin/master' into havana
version bump
finish s/quantum/neutron/ from 7aaf979c42
Merge pull request #74 from invsblduck/havana_neutron_renames

finish s/quantum/neutron/ from 7aaf979c42
legacy filter_factory breaks havana neutron-server

(supposed to be fixed by https://bugs.launchpad.net/nova/+bug/1143998)
use newer (raring) openvswitch dkms

works with 12.04.[23]
Merge pull request #76 from rackerjoe/master

Merged automatically by jenkins after successful build test
use openvswitch-datapath-lts-raring-dkms

and install kernel headers too
install kernel headers before openvswitch dkms
Merge pull request #77 from invsblduck/issue598_ovs_dkms

Merged automatically by jenkins after successful build test
change repo to havana in neutron-ovs-plugin, sets kombu as rpc_backend for neutron
Don't hard-code grizzly or havana in yum repo name

This coincides with refactored repo code in osops::packages
Switch to package_options from package_overrides
Merge branch 'havana' of github.com:rcbops-cookbooks/nova-network

Conflicts:
	attributes/default.rb
	metadata.rb
issue #603: better proc regexes for monit
Add attribute for Neutron notification_driver

Set by node["neutron"]["notification_driver"]
Defaults to "neutron.openstack.common.notifier.no_op_notifier"

Fixes rcbops/chef-cookbooks#637
Merge pull request #80 from DavidWittman/637-notification-driver

Add attribute for Neutron notification_driver
Merge pull request #78 from invsblduck/issue603_monit_new

Merged automatically by jenkins after successful build test
Add rpcdaemon for l3 ha

This adds a temporary repo for package testing, installs and configures
Apsu's rpcdaemon.  The real repo should be installed later, and in
the right place.  This is for testing only at this point.