Skip to content

Commit

Permalink
Merge pull request #64 from OSC/1.6.16_release_prep
Browse files Browse the repository at this point in the history
Update to 1.6.16
  • Loading branch information
ericfranz authored Sep 25, 2019
2 parents 0a56423 + e45b843 commit 0342b0b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [1.6.16] - 2019-09-25
### Fixed
- debian fix for bin/setup in Active Jobs and Dashboard
- use latest ondemand release RPM
- fixed exit codes for `update_ood_portal` script

## [1.6.15] - 2019-09-24
### Fixed
- files app updated for Lustre copy bugfix
Expand Down Expand Up @@ -230,7 +236,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- From 1.3.7 - 1.4.2 updated app versions


[Unreleased]: https://github.com/OSC/ondemand/compare/v1.6.15...HEAD
[Unreleased]: https://github.com/OSC/ondemand/compare/v1.6.16...HEAD
[1.6.16]: https://github.com/OSC/ondemand/compare/v1.6.15...v1.6.16
[1.6.15]: https://github.com/OSC/ondemand/compare/v1.6.14...v1.6.15
[1.6.14]: https://github.com/OSC/ondemand/compare/v1.6.13...v1.6.14
[1.6.13]: https://github.com/OSC/ondemand/compare/v1.6.12...v1.6.13
Expand Down
4 changes: 2 additions & 2 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"name": "dashboard",
"url": "https://github.com/OSC/ood-dashboard",
"tag": "v1.35.2",
"tag": "v1.35.3",
"app": true
},
{
Expand All @@ -26,7 +26,7 @@
{
"name": "activejobs",
"url": "https://github.com/OSC/ood-activejobs",
"tag": "v1.9.3",
"tag": "v1.9.4",
"app": true
},
{
Expand Down
2 changes: 1 addition & 1 deletion packaging/ondemand.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global package_name ondemand
%global major 1
%global minor 6
%global patch 15
%global patch 16
%global ondemand_version %{major}.%{minor}
%{!?package_version: %define package_version %{major}.%{minor}.%{patch}}
%{!?package_release: %define package_release 1}
Expand Down

0 comments on commit 0342b0b

Please sign in to comment.