diff options
| author | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
| commit | 091001ae8d27a8a5de03af2c20905e23a8ffefb7 (patch) | |
| tree | 28abfa5821f80e2090b8f89988a0bab004b710a5 /spec/unit/cookbook/metadata_spec.rb | |
| parent | 8a7b450cb87ef62e9f21d32c91a52accefba6ffd (diff) | |
| parent | a45716b67a2168c21b166e4aab38668e9b96d856 (diff) | |
| download | chef-merging-master.tar.gz | |
Merge branch 'master' into merging-mastermerging-master
Conflicts:
lib/chef/version.rb
Diffstat (limited to 'spec/unit/cookbook/metadata_spec.rb')
| -rw-r--r-- | spec/unit/cookbook/metadata_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/cookbook/metadata_spec.rb b/spec/unit/cookbook/metadata_spec.rb index a1903a1948..760ae5dd2a 100644 --- a/spec/unit/cookbook/metadata_spec.rb +++ b/spec/unit/cookbook/metadata_spec.rb @@ -441,7 +441,7 @@ describe Chef::Cookbook::Metadata do }.not_to raise_error end - it "should let type be hash (backwards compatability only)" do + it "should let type be hash (backwards compatibility only)" do expect { metadata.attribute("db/mysql/databases", :type => "hash") }.not_to raise_error |