Upcoming chef-server repository merges


#1

Ohai Chefs,

Later this week(likely Thursday or Friday), we’ll be merging the
following projects into a
single chef-server repository:

  • opscode-omnibus
  • oc-chef-pedant
  • oc_erchef
  • oc_bifrost
  • chef-mover
  • chef-server-bootstrap
  • oc-id
  • opscode-expander

You can find the git strategy that we will be using in the
following pull-request:

All issues and PRs on the upstream repos will be reviewed and
either closed or moved as appopriate.

Some projects depend on oc-chef-pedant. If you depend on this
project via a git source in your Gemfile, simply update the git
URL. We have confirmed that bundler will still operate
correctly. The next release may bump the version to be in line with the
released server version.

Why are we doing this?

The goal of this merge is to:

  1. Make it easier to develop and review chef-server features and
    fixes,

  2. Lower the start-up time for new contributors to the Chef
    Server, and

  3. Ensure that changes to Chef Server components are shipped in a
    Chef Server package as soon as they are ready.

What about the git history?

The git history is being preserved as part of this merge. To see
the full history of a given file, you will likely need to use the
--follow flag when running git log.

Please let us know if you run into any problems working with the
combined repository after the merge!

Sincerely,

Steven and Chef Core Engineering


#2

On 04/28/2015 06:39, Steven Danna wrote:

Some projects depend on oc-chef-pedant. If you depend on this
project via a git source in your Gemfile, simply update the git
URL. We have confirmed that bundler will still operate
correctly. The next release may bump the version to be in line with the
released server version.

Why are we doing this?

The goal of this merge is to:

  1. Make it easier to develop and review chef-server features and
    fixes,

  2. Lower the start-up time for new contributors to the Chef
    Server, and

  3. Ensure that changes to Chef Server components are shipped in a
    Chef Server package as soon as they are ready.

What about the git history?

The git history is being preserved as part of this merge. To see
the full history of a given file, you will likely need to use the
--follow flag when running git log.

Just a thought, that I may not have fully considered the ramifications
of, but you could alternatively import the modules to the meta
repository using git subtree, close pull-requests and issues on the
other repos and add git hooks on the meta repo to keep the other
repositories up-to-date, avoiding any impact on other projects that
reference the current repositories.