summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-10-26 12:15:19 -0700
committerTim Smith <tsmith@chef.io>2018-10-26 12:23:24 -0700
commit8f97c84db49b62a77667afda672cccb0e1cb41bd (patch)
tree1b3a06117b299c50b7ca003b8d3b8a04c2692162
parentecd1a09f60cc7946021499ec1407c389cbcaa4be (diff)
downloadchef-8f97c84db49b62a77667afda672cccb0e1cb41bd.tar.gz
Start Chef 15 development
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/config.yml2
-rw-r--r--RELEASE_NOTES.md4
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb4
5 files changed, 10 insertions, 4 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 438ee3c1a6..cd173c90ec 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -41,6 +41,8 @@ github:
# for building.
release_branch:
- master:
+ version_constraint: 15*
+ - chef-14:
version_constraint: 14*
- chef-13:
version_constraint: 13*
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 79e995bb5d..1dce31400b 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,9 @@
This file holds "in progress" release notes for the current release under development and is intended for consumption by the Chef Documentation team. Please see <https://docs.chef.io/release_notes.html> for the official Chef release notes.
+# UNRELEASED (Chef 15)
+
+Chef 15 release notes will be added here as development progresses.
+
# Chef Client Release Notes 14.6:
## Smaller Package and Install Size
diff --git a/VERSION b/VERSION
index 0cec8c78dd..94188a7483 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.47 \ No newline at end of file
+15.0.0
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 2da9c1a5f7..53df0caa9a 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "14.6.47".freeze
+ VERSION = "15.0.0".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0e8cf397eb..7da7840685 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -1,4 +1,4 @@
-# Copyright:: Copyright 2010-2016, Chef Software, Inc.
+# Copyright:: Copyright 2010-2018, Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("14.6.47")
+ VERSION = Chef::VersionString.new("15.0.0")
end
#