Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release version 1.3.0 #283

Closed
wants to merge 158 commits into from
Closed

Conversation

abarciauskas-bgse
Copy link
Contributor

Release version 1.3.0

Includes a bunch of changes from master since release was out of date with master.

To resolve conflicts, I merged release into release-version-v1.3.0, fixed conflicts, and then merged release-version-v1.3.0 into release-version-1.3.0. There's no reason I did it that way as opposed to merging release directly into release-version-1.3.0 and resolving conflicts, the outcome should be the same. To resolve conflicts I picked the master version of a file over the release version in every case.

Scisco and others added 19 commits March 28, 2018 15:55
Update all tests to use test-data package
fix missing schemas directory in hello-world task
**Summary:** Adds support for testing output of activities in workflow tests

Addresses https://bugs.earthdata.nasa.gov/browse/CUMULUS-436

## Changes

* Replaces `integration-tests/lambda.js` with `integration-tests/sfnStep.js` and removes many reference to `lambda`
* `sfnStep.js` includes `LambdaStep` and `ActivityStep` classes which inherit from `SfnStep`
* Update CHANGELOG
* Update exports from `integration-tests/index.js`

## Test Plan

- [x] N/A Unit tests
- [x] Integration tests passing (see nasa/cumulus-integration-tests#10)
- [x] Updated CHANGELOG

Reviewers: @sethvincent @yjpa7145 @laurenfrederick
@scisco
Copy link
Contributor

scisco commented Mar 30, 2018

closing and opening again master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants