Skip to content

Commit

Permalink
Merge pull request #61 from OSC/1.6.15_release_prep
Browse files Browse the repository at this point in the history
upgrade to v1.6.15
  • Loading branch information
ericfranz authored Sep 24, 2019
2 parents 95cea23 + 9839f1c commit b59d5c8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ 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.15] - 2019-09-24
### Fixed
- files app updated for Lustre copy bugfix

## [1.6.14] - 2019-09-19
### Fixed
- files, file editor, job composer apps all get fix in bin/setup for output redirection
Expand Down Expand Up @@ -226,7 +230,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.14...HEAD
[Unreleased]: https://github.com/OSC/ondemand/compare/v1.6.15...HEAD
[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
[1.6.12]: https://github.com/OSC/ondemand/compare/v1.6.11...v1.6.12
Expand Down
2 changes: 1 addition & 1 deletion config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"name": "files",
"url": "https://github.com/OSC/ood-fileexplorer",
"tag": "v1.6.2",
"tag": "v1.6.3",
"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 7
%global patch 15
%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 b59d5c8

Please sign in to comment.