Merge branch 'develop' into iss1393-update-keys

Author: tcmitchell

CHANGES.md

@@ -1,13 +1,24 @@
 # GENI Portal Release Notes
 
+# [Release 3.15](https://github.com/GENI-NSF/geni-portal/milestones/3.15)
+
+## Changes
+
+* Provide a way to update SSH keys on existing resources
+  ([#1393](https://github.com/GENI-NSF/geni-portal/issues/1393))
+
+## Installation Notes
+
+* None
+
 # [Release 3.14](https://github.com/GENI-NSF/geni-portal/milestones/3.14)
 
 ## Changes
 
 * Standardize python shebang declaration
   ([#1367](https://github.com/GENI-NSF/geni-portal/issues/1367))
-* Provide a way to update SSH keys on existing resources
-  ([#1393](https://github.com/GENI-NSF/geni-portal/issues/1393))
+* Delete obsolete files
+  ([#1701](https://github.com/GENI-NSF/geni-portal/issues/1701))
 
 ## Installation Notes
 
@@ -20,9 +31,9 @@
     sudo rm /var/www/common/map/rspec-*.xml
     sudo rm -r /var/www/common/map/1080display
     sudo rm -r /var/www/common/map/OpenLayers-2.13
-    sudo rm -r /var/www/common/InC_Participant.png
-    sudo rm -r /var/www/common/README-incommon-logo.txt
-    sudo rm -r /var/www/common/logos.html
+    sudo rm /var/www/common/InC_Participant.png
+    sudo rm /var/www/common/README-incommon-logo.txt
+    sudo rm /var/www/common/logos.html
     ```
 
 # [Release 3.13](https://github.com/GENI-NSF/geni-portal/milestones/3.13)

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([geni-ch], [3.14], [[email protected]])
+AC_INIT([geni-ch], [3.15], [[email protected]])
 #AM_INIT_AUTOMAKE([foreign -Wall -Werror])
 #AM_INIT_AUTOMAKE([foreign -Wall])
 AM_INIT_AUTOMAKE([foreign -Wall -Wno-portability])

geni-portal.spec

@@ -2,7 +2,7 @@
 %define legacy_name geni-ch
 
 Name:           geni-portal
-Version:        3.14
+Version:        3.15
 Release:        1%{?dist}
 Summary:        GENI Experimenter Portal
 BuildArch:      noarch