Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Merge oc-pushy-pedant #131

Merged
merged 254 commits into from
Jul 19, 2016
Merged

Merge oc-pushy-pedant #131

merged 254 commits into from
Jul 19, 2016

Conversation

stevendanna
Copy link
Contributor

This merge was created using the same method used in omnibus_merge.sh

doubt72 and others added 30 commits September 17, 2012 15:14
…-tests, chef-pedant-core, oc-chef-pedant-core
markan and others added 25 commits September 13, 2015 17:27
Revert this once a better plan is found.
This tag is master, right after the seed option was merged to
pedant. This can be replaced with a tag next time chef-server is
tagged.
Many tests are failing because the test starts before the client has
started. This adds checks to make sure the client is up before the
test starts.
This is the start of a simple script + cookbook for setting up
a push-server and push-client cluster to help make manual push-jobs
testing a little quicker. It has similar goals to [analytics-setup](https://github.com/chef/chef-analytics/tree/master/dev/cookbooks/analytics-setup).

It uses `test-kitchen` and `knife` to stand up a chef-server VM
that has push-jobs-server installed and configured on it and then
also a chef-client VM that has the push-client installed and
configured on it.
push-setup script for aiding manual testing
Update README with more accurate testing instructions
Update oc-chef-pedant dependencies
@chef-supermarket
Copy link

Hi. I am an automated pull request bot named Curry. There are commits in this pull request whose authors are not yet authorized to contribute to Chef Software, Inc. projects or are using a non-GitHub verified email address. To become authorized to contribute, you will need to sign the Contributor License Agreement (CLA) as an individual or on behalf of your company. You can read more on Chef's blog.

Non-GitHub Verified Committers

There are 1 commit author(s) whose commits are authored by a non-GitHub verified email address. Chef will have to manually verify that they are authorized to contribute.

Please sign the CLA here.

@markan markan merged commit 73c0e88 into master Jul 19, 2016
@markan markan deleted the ssd/merge-pedant branch July 19, 2016 16:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

8 participants