Skip to content

Commit

Permalink
Merge pull request #72 from jtpalmer/version-sync-8.5-8.6
Browse files Browse the repository at this point in the history
Version sync 8.5 -> 8.6
  • Loading branch information
jtpalmer authored Oct 30, 2019
2 parents 6148e74 + 6a2066e commit d65901c
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 51 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ indent_size = 2

[*.md]
trim_trailing_whitespace = false

[*.yml]
indent_size = 2
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
Open XDMoD Application Kernels Change Log
=========================================

## 2019-10-21 v8.5.0

- Bug Fixes
- General
- Removing unneeded `print` statement ([PR \#68](https://github.com/ubccr/xdmod/pull/68))
- Multiple fixes ([PR \#65](https://github.com/ubccr/xdmod/pull/65))
- Enhancements
- User Dashboard
- Update help for Center Report component. ([PR \#67](https://github.com/ubccr/xdmod/pull/67))
- Minor UI changes to Center Report Portlet ([PR \#64](https://github.com/ubccr/xdmod/pull/64))
- New Features
- User Dashboard
- User Dashboard - Center Report Card ([PR \#63](https://github.com/ubccr/xdmod/pull/63))
- Release Prep
- General
- Update version numbers to 8.5 ([PR \#61](https://github.com/ubccr/xdmod/pull/61))

## 2019-04-23 v8.1.0

- Bug Fixes
Expand Down
2 changes: 0 additions & 2 deletions classes/AppKernel/PerformanceMap.php
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,6 @@ public function make_report($internal_dashboard_user=false)

$message.="</table>\n";
$message.='The status code is linked to full report of the last run.<br/><br/>';
print($message);


$totalColumns=1+count($rec_dates)+1;

Expand Down
16 changes: 9 additions & 7 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ github_url: https://github.com/ubccr/xdmod-appkernels
xdmod_module_name: Application Kernels

defaults:
-
scope:
path: ""
type: "pages"
values:
layout: "page"
menu_markdown: "menu.md"
-
scope:
path: ""
type: "pages"
values:
layout: "page"
sw_version: "8.6.0"
style: "effervescence"
tocversion: "toc"

# Build settings
markdown: kramdown
Expand Down
36 changes: 36 additions & 0 deletions docs/_data/toc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
toc:
- title: About
subfolderitems:
- page: Overview
url: /ak-overview.html
- title: Download
subfolderitems:
- page: Open XDMoD module
url: https://github.com/ubccr/xdmod-appkernels/releases/latest
- page: AKRR package
url: https://github.com/ubccr/akrr/releases/latest
- title: Installing
subfolderitems:
- page: Installation Guide
url: /ak-install.html
subsubfolderitems:
- page: RPM Installation Guide
url: /ak-install-rpm.html
- page: Source Installation Guide
url: /ak-install-source.html
- page: Configuration Guide
url: /ak-configuration.html
- page: Database Guide
url: /ak-databases.html
- title: Using
subfolderitems:
- page: Command Reference
url: /ak-commands.html
- page: Ingestor Guide
url: /ak-ingestor.html
- title: Developing
subfolderitems:
- page: Open XDMoD Module
url: https://github.com/ubccr/xdmod-appkernels
- page: AKRR
url: https://github.com/ubccr/akrr
31 changes: 0 additions & 31 deletions docs/_includes/menu.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/ak-install-rpm.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: Application Kernels RPM Installation Guide
Install RPM Package
-------------------

# yum install xdmod-appkernels-x.x.x-x.x.el6.noarch.rpm
# yum install xdmod-appkernels-{{ page.sw_version }}-1.0.el7.noarch.rpm

Run Configuration Script
------------------------
Expand Down
22 changes: 12 additions & 10 deletions xdmod-appkernels.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,25 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/cron.d/%{name}

%changelog
* Mon Oct 21 2019 XDMoD <[email protected]> 8.5.0-1.0
- Release 8.5.0
* Tue Apr 23 2019 XDMoD <[email protected]> 8.1.0-1.0
- Release 8.1.0.
- Release 8.1.0.
* Wed Nov 07 2018 XDMoD <[email protected]> 8.0.0-1.0
- Release 8.0.0.
- Release 8.0.0.
* Thu Mar 01 2018 XDMoD <[email protected]>7.5.0-1.0
- Release 7.5.0.
- Release 7.5.0.
* Thu Sep 21 2017 XDMoD <[email protected]>7.0.0-1.0
- Release 7.0.0.
- Release 7.0.0.
* Thu May 11 2017 XDMoD <[email protected]>6.6.0-1.0
- Release 6.6.0.
- Release 6.6.0.
* Tue Jan 10 2017 XDMoD <[email protected]>6.5.0-1.0
- Release 6.5.0.
- Release 6.5.0.
* Wed Sep 21 2016 XDMoD <[email protected]>6.0.0-1.0
- Release 6.0.0.
- Release 6.0.0.
* Tue May 24 2016 XDMoD <[email protected]>5.6.0-1.0
- Release 5.6.0.
- Release 5.6.0.
* Fri Dec 18 2015 XDMoD <[email protected]>5.5.0-1.0
- Release 5.5.0.
- Release 5.5.0.
* Wed Aug 19 2015 XDMoD <[email protected]> 5.0.0-1.0
- Initial public release
- Initial public release

0 comments on commit d65901c

Please sign in to comment.