Skip to content

Commit ee88686

Browse files
author
Tim Hinderliter
committed
Merge branch 'master' into pl-master
2 parents dce9f83 + 1e59ad7 commit ee88686

64 files changed

Lines changed: 87 additions & 84 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎chef-expander/lib/chef/expander/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
module Chef
2424
module Expander
2525

26-
VERSION = "0.10.0.rc.1"
26+
VERSION = "0.10.0"
2727

2828
def self.version
2929
@rev ||= begin

‎chef-server-api/Gemfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ../chef
33
specs:
4-
chef (0.10.0.rc.1)
4+
chef (0.10.0)
55
bunny (>= 0.6.0)
66
erubis
77
highline
@@ -21,8 +21,8 @@ PATH
2121
PATH
2222
remote: ../chef-solr
2323
specs:
24-
chef-solr (0.10.0.rc.1)
25-
chef (= 0.10.0.rc.1)
24+
chef-solr (0.10.0)
25+
chef (= 0.10.0)
2626

2727
GEM
2828
remote: http://rubygems.org/

‎chef-server-api/lib/chef-server-api/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module ChefServerApi
2-
VERSION = '0.10.0.rc.1'
2+
VERSION = '0.10.0'
33
end

‎chef-server-webui/lib/chef-server-webui/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module ChefServerWebui
2-
VERSION = '0.10.0.rc.1'
2+
VERSION = '0.10.0'
33
end

‎chef-server/lib/chef-server/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
#
1818

1919
module ChefServer
20-
VERSION = '0.10.0.rc.1'
20+
VERSION = '0.10.0'
2121
end

‎chef-solr/lib/chef/solr/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class Chef
22
class Solr
3-
VERSION = '0.10.0.rc.1'
3+
VERSION = '0.10.0'
44

55
# Solr Schema. Used to detect incompatibilities between installed solr and
66
# chef-solr versions.

‎chef/distro/common/html/chef-client.8.html‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

chef/distro/common/html/chef-expander-cluster.8.html renamed to chef/distro/common/html/chef-expander.8.html

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎chef/distro/common/html/chef-expanderctl.8.html‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎chef/distro/common/html/chef-server-webui.8.html‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)