From 959ec25027f1bce091dcd9cc2d93c721ff2dc35d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 27 Oct 2014 10:21:09 -0400
Subject: [PATCH] Merged #110 "Support multiple/chained config files"

---
 releases.moxie |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 17047a8..ba7a870 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,22 +1,30 @@
 #
 # ${project.version} release
 #
-r26: {
+r27: {
     title: ${project.name} ${project.version} released
     id: ${project.version}
     date: ${project.buildDate}
     note: ~
     html: ~
-    text: ~
+    text: ''
+          The new gitblit.properties file "includes" defaults.properties which is the original
+          gitblit.properties file. You may continue using your existing gitblit.properties file
+          as before, however, you might find future upgrades simpler by adopting the new "include"
+          design.
+          ''
     security: ~
     fixes: ~
     changes:
     - Replaced Dagger with Guice (ticket-80)
     - Use release name as root directory in Gitblit GO artifacts (ticket-109)
+    - Split gitblit.properties into gitblit.properties & defaults.properties (ticket-110)
     - Show team type in teams page (pr-217, ticket-168)
     additions:
+    - Add GitHub Octicons (ticket-106)
+    - Support for chain-loading properties files (ticket-110) 
     - Add Priority & Severity fields for tickets (pr-220, ticket-157)
-    - Add Maintenance ticket type (pr-223, ticket-206)
+    - Add Maintenance ticket type (pr-223, ticket-206)    
     dependencyChanges:
     - Guice 4.0-beta4 (ticket-80)
     - SLF4j 1.7.7 (ticket-122)
@@ -29,6 +37,28 @@
     - Alex Lewis
     - Florian Zschocke
     - Paul Martin
+}
+
+#
+# 1.6.2 release
+#
+r26: {
+    title: Gitblit 1.6.2 released
+    id: 1.6.2
+    date: ${project.buildDate}
+    note: ~
+    html: ~
+    text: ~
+    security: ~
+    fixes:
+    - Fix French translation (pr-224, ticket-210)
+    - Fix raw servlet trashing paths with spaces (ticket-211)
+    changes: ~
+    additions: ~
+    dependencyChanges: ~
+    contributors:
+    - Pierre Templier
+    - Barry Roberts 
 }
 
 #
@@ -1565,6 +1595,6 @@
 	- James Moger
 }
 
-snapshot: &26
-release: &r25
-releases: &r[1..25]
+snapshot: &r27
+release: &r26
+releases: &r[1..26]

--
Gitblit v1.9.1