basho/riak-chef-cookbook — pull request #154 by cheeseplus (2014-10-18 04:42:34+00:00)
Title: Fix merge issues

Fix some merge errors and tests