Skip to content

Commit d57d2a4

Browse files
author
AJ Christensen
committed
Make chef-server's various forms require greater than 1.0 of Merb
1 parent 1ba15b3 commit d57d2a4

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎chef-server-slice/config/init.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# code and views.
2222
#
2323

24-
merb_gems_version = "1.0.10"
24+
merb_gems_version = "> 1.0"
2525
dependency "merb-haml", merb_gems_version
2626
dependency "merb-assets", merb_gems_version
2727
dependency "merb-helpers", merb_gems_version

‎chef-server/config/dependencies.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
2-
merb_gems_version = "1.0.10"
2+
merb_gems_version = "> 1.0"
33

44
# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
55
dependency "merb-core", merb_gems_version

0 commit comments

Comments
 (0)