updating rabbitmq and modules
Merge branch 'master' of https://github.com/rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Merge branch 'master' of https://github.com/rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Merge pull request #282 from rcbops/sprint

End of Sprint 16 Merge
Auto Updating database submodule
Auto Updating osops-utils submodule
Merge pull request #283 from rackerjoe/sprint

add corosync cookbook
Auto Updating osops-utils submodule
Auto Updating osops-utils submodule
Auto Updating selinux submodule
Auto Updating yum submodule
Auto Updating swift submodule
Auto Updating rabbitmq submodule
Auto Updating haproxy submodule
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint

Conflicts:
	cookbooks/rabbitmq
Adding nova-network::network to compute role and nova-network::setup to controller roles