Skip to content

Commit

Permalink
merge release to master
Browse files Browse the repository at this point in the history
  • Loading branch information
Scisco committed Mar 15, 2018
2 parents 32515c9 + b073cd9 commit d16453f
Show file tree
Hide file tree
Showing 19 changed files with 35 additions and 32 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ jobs:
- ./cumulus/tasks/queue-pdrs/node_modules
- ./cumulus/tasks/sync-granule/node_modules
- ./cumulus/tasks/discover-s3-granules/node_modules
- ./cumulus/tasks/sf-sns-report/node_modules

- save_cache:
key: gitc-tasks-{{ checksum "global-hash" }}
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [v1.1.4] - 2018-03-15
### Added
- added flag `useList` to parse-pdr [CUMULUS-404]

Expand Down Expand Up @@ -83,7 +84,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [v1.0.0] - 2018-02-23

[Unreleased]: https://github.com/cumulus-nasa/cumulus/compare/v1.1.3...HEAD
[Unreleased]: https://github.com/cumulus-nasa/cumulus/compare/v1.1.4...HEAD
[v1.1.4]: https://github.com/cumulus-nasa/cumulus/compare/v1.1.3...v1.1.4
[v1.1.3]: https://github.com/cumulus-nasa/cumulus/compare/v1.1.2...v1.1.3
[v1.1.2]: https://github.com/cumulus-nasa/cumulus/compare/v1.1.1...v1.1.2
[v1.1.1]: https://github.com/cumulus-nasa/cumulus/compare/v1.0.1...v1.1.1
Expand Down
4 changes: 2 additions & 2 deletions cumulus/tasks/discover-granules/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/discover-granules",
"version": "1.1.3",
"version": "1.1.4",
"description": "Discover Granules in FTP/HTTP/SFTP endpoints",
"main": "index.js",
"directories": {
Expand Down Expand Up @@ -39,7 +39,7 @@
"dependencies": {
"@cumulus/common": "^1.1.3",
"@cumulus/cumulus-message-adapter-js": "^1.0.1",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"@cumulus/test-data": "^1.1.3",
"babel-core": "^6.25.0",
"babel-loader": "^6.2.4",
Expand Down
4 changes: 2 additions & 2 deletions cumulus/tasks/discover-pdr/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cumulus/discover-pdr",
"private": true,
"version": "1.1.3",
"version": "1.1.4",
"description": "SIPS handler PDR discovery task",
"main": "index.js",
"keywords": [
Expand Down Expand Up @@ -37,7 +37,7 @@
},
"dependencies": {
"@cumulus/common": "^1.1.3",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"ftp": "^0.3.10",
"node-fetch": "^1.6.1",
"parse-duration": "^0.1.1",
Expand Down
4 changes: 2 additions & 2 deletions cumulus/tasks/discover-pdrs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/discover-pdrs",
"version": "1.1.3",
"version": "1.1.4",
"description": "Discover PDRs in FTP and HTTP endpoints",
"main": "index.js",
"directories": {
Expand Down Expand Up @@ -38,7 +38,7 @@
"dependencies": {
"@cumulus/common": "^1.1.3",
"@cumulus/cumulus-message-adapter-js": "^1.0.1",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"@cumulus/test-data": "^1.1.3",
"babel-core": "^6.25.0",
"babel-loader": "^6.2.4",
Expand Down
4 changes: 2 additions & 2 deletions cumulus/tasks/discover-s3-granules/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/discover-s3-granules",
"version": "1.1.3",
"version": "1.1.4",
"description": "Discover granules from an S3 bucket",
"main": "index.js",
"directories": {
Expand Down Expand Up @@ -37,7 +37,7 @@
"dependencies": {
"@cumulus/common": "^1.1.3",
"@cumulus/cumulus-message-adapter-js": "^1.0.1",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"@cumulus/test-data": "^1.1.3",
"babel-core": "^6.25.0",
"babel-loader": "^6.2.4",
Expand Down
4 changes: 2 additions & 2 deletions cumulus/tasks/generate-pdr-file-list/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cumulus/generate-pdr-file-list",
"private": true,
"version": "1.1.3",
"version": "1.1.4",
"description": "SIPS handler PDR processing task",
"main": "index.js",
"keywords": [
Expand Down Expand Up @@ -36,7 +36,7 @@
},
"dependencies": {
"@cumulus/common": "^1.1.3",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"@cumulus/pvl": "^1.0.0",
"ftp": "^0.3.10",
"node-fetch": "^1.6.1",
Expand Down
4 changes: 2 additions & 2 deletions cumulus/tasks/parse-pdr/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/parse-pdr",
"version": "1.1.3",
"version": "1.1.4",
"description": "Download and Parse a given PDR",
"main": "index.js",
"directories": {
Expand Down Expand Up @@ -41,7 +41,7 @@
"dependencies": {
"@cumulus/common": "^1.1.3",
"@cumulus/cumulus-message-adapter-js": "^1.0.1",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"@cumulus/test-data": "^1.1.3",
"babel-core": "^6.25.0",
"babel-loader": "^6.2.4",
Expand Down
4 changes: 2 additions & 2 deletions cumulus/tasks/pdr-status-check/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/pdr-status-check",
"version": "1.1.3",
"version": "1.1.4",
"description": "Checks execution status of granules in a PDR",
"main": "index.js",
"directories": {
Expand Down Expand Up @@ -42,7 +42,7 @@
"dependencies": {
"@cumulus/common": "^1.1.3",
"@cumulus/cumulus-message-adapter-js": "^1.0.1",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"@cumulus/test-data": "^1.1.3",
"babel-core": "^6.25.0",
"babel-loader": "^6.2.4",
Expand Down
4 changes: 2 additions & 2 deletions cumulus/tasks/post-to-cmr/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/post-to-cmr",
"version": "1.1.3",
"version": "1.1.4",
"description": "Post a given granule to CMR",
"main": "index.js",
"directories": {
Expand Down Expand Up @@ -44,7 +44,7 @@
"@cumulus/cmrjs": "^1.1.3",
"@cumulus/common": "^1.1.3",
"@cumulus/cumulus-message-adapter-js": "^1.0.1",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"@cumulus/test-data": "^1.1.3",
"babel-core": "^6.25.0",
"babel-loader": "^6.2.4",
Expand Down
4 changes: 2 additions & 2 deletions cumulus/tasks/queue-granules/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/queue-granules",
"version": "1.1.3",
"version": "1.1.4",
"description": "Add discovered granules to the queue",
"main": "index.js",
"directories": {
Expand Down Expand Up @@ -40,7 +40,7 @@
"dependencies": {
"@cumulus/common": "^1.1.3",
"@cumulus/cumulus-message-adapter-js": "^1.0.1",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"babel-core": "^6.25.0",
"babel-loader": "^6.2.4",
"babel-plugin-transform-async-to-generator": "^6.24.1",
Expand Down
4 changes: 2 additions & 2 deletions cumulus/tasks/queue-pdrs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/queue-pdrs",
"version": "1.1.3",
"version": "1.1.4",
"description": "Add discovered PDRs to a queue",
"main": "index.js",
"directories": {
Expand Down Expand Up @@ -39,7 +39,7 @@
"dependencies": {
"@cumulus/common": "^1.1.3",
"@cumulus/cumulus-message-adapter-js": "^1.0.1",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"babel-core": "^6.25.0",
"babel-loader": "^6.2.4",
"babel-plugin-transform-async-to-generator": "^6.24.1",
Expand Down
4 changes: 2 additions & 2 deletions cumulus/tasks/sync-granule/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/sync-granule",
"version": "1.1.3",
"version": "1.1.4",
"description": "Download a given granule",
"main": "index.js",
"directories": {
Expand Down Expand Up @@ -43,7 +43,7 @@
"dependencies": {
"@cumulus/common": "^1.1.3",
"@cumulus/cumulus-message-adapter-js": "^1.0.1",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"@cumulus/test-data": "^1.1.3",
"babel-core": "^6.25.0",
"babel-loader": "^6.2.4",
Expand Down
4 changes: 2 additions & 2 deletions cumulus/tasks/validate-pdr/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cumulus/validate-pdr",
"private": true,
"version": "1.1.3",
"version": "1.1.4",
"description": "SIPS handler PDR processing task",
"main": "index.js",
"keywords": [
Expand Down Expand Up @@ -40,7 +40,7 @@
},
"dependencies": {
"@cumulus/common": "^1.1.3",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"@cumulus/pvl": "^1.0.0",
"ftp": "^0.3.10",
"node-fetch": "^1.6.1",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "2.9.0",
"version": "1.1.3",
"version": "1.1.4",
"packages": [
"packages/*",
"cumulus/tasks/*",
Expand Down
4 changes: 2 additions & 2 deletions packages/api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/api",
"version": "1.1.3",
"version": "1.1.4",
"description": "Lambda functions for handling all daac's API operations",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -34,7 +34,7 @@
"dependencies": {
"@cumulus/cmrjs": "^1.1.3",
"@cumulus/common": "^1.1.3",
"@cumulus/ingest": "^1.1.3",
"@cumulus/ingest": "^1.1.4",
"@cumulus/pvl": "^1.0.0",
"ajv": "^5.2.2",
"archiver": "^2.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/deployment/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/deployment",
"version": "1.1.3",
"version": "1.1.4",
"description": "Deployment templates for cumulus",
"scripts": {
"test": "ava --no-color",
Expand Down
2 changes: 1 addition & 1 deletion packages/ingest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/ingest",
"version": "1.1.3",
"version": "1.1.4",
"description": "Ingest utilities",
"scripts": {
"test": "env TEST=true ava"
Expand Down
4 changes: 2 additions & 2 deletions packages/integration-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cumulus/integration-tests",
"version": "1.1.3",
"version": "1.1.4",
"description": "Integration tests",
"bin": {
"cumulus-test": "./bin/cli.js"
Expand Down Expand Up @@ -30,7 +30,7 @@
"license": "Apache-2.0",
"dependencies": {
"@cumulus/common": "^1.1.3",
"@cumulus/deployment": "^1.1.3",
"@cumulus/deployment": "^1.1.4",
"babel-core": "^6.25.0",
"babel-loader": "^6.2.4",
"babel-plugin-transform-async-to-generator": "^6.24.1",
Expand Down

0 comments on commit d16453f

Please sign in to comment.