summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@opscode.com>2014-02-04 12:51:47 -0800
committerdanielsdeleo <dan@opscode.com>2014-02-04 12:51:47 -0800
commitf38c0630bb3f9dbcf386602ea2791c670ccc7089 (patch)
tree01d73335fa52d49594777ef1d1bc6f347853dd55
parent90bbe75409e9b54b7c1094f9abeb6588c6dd7fe2 (diff)
parent7b55f38e551b984535ff95d427887851489d2b13 (diff)
downloadchef-f38c0630bb3f9dbcf386602ea2791c670ccc7089.tar.gz
Merge branch 'master' into 11-stable
-rw-r--r--lib/chef/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 31a9ba0f65..4aff92d00b 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -17,7 +17,7 @@
class Chef
CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
- VERSION = '11.10.0.alpha.1'
+ VERSION = '11.10.0.rc.1'
end
# NOTE: the Chef::Version class is defined in version_class.rb