removing monitoring from the cookbooks, replaced by openstack-monitoring
Merge pull request #36 from rackerjoe/grizzly

Merged automatically by jenkins after successful build test
removing monitoring dep
Merge branch 'grizzly' of github.com:rcbops-cookbooks/cinder into grizzly
adding solidfire support to cinder
removing monitoring from the cookbooks, replaced by openstack-monitoring
removing monitoring dep
adding solidfire support to cinder
EMC support
Merge pull request #37 from jcannava/grizzly

Merged automatically by jenkins after successful build test
Merge branch 'grizzly' of git://github.com/rcbops-cookbooks/cinder into grizzly

Conflicts:
	README.md
	attributes/default.rb
	recipes/cinder-volume.rb
	templates/default/cinder.conf.erb
Support MaskingView for VMAX
Merge pull request #39 from willkelly/grizzly

Merged automatically by jenkins after successful build test
Merge branch 'grizzly' of git://github.com/rcbops-cookbooks/cinder into grizzly
Merge pull request #40 from willkelly/grizzly

Merged automatically by jenkins after successful build test
Updating for grizzly
iscsi_ip_address needs to point to emc gear.
Added template for emc config.xml
Updated docs.
newline
Merge pull request #41 from willkelly/grizzly

Merged automatically by jenkins after successful build test
us335