From c2634fbb8316a0b4633421e6a9a2df29b5ab92a5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Jul 2014 16:07:23 -0400
Subject: [PATCH] Update to SSHD 0.11.1-atlassian-1

---
 releases.moxie |   48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 64039bc..61c43c4 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,10 +1,48 @@
 #
 # ${project.version} release
 #
-r24: {
+r25: {
     title: ${project.name} ${project.version} released
     id: ${project.version}
     date: ${project.buildDate}
+    note: ~
+    html: ~
+    text: ~
+    security: ~
+    fixes:
+    - Fixed NPE when there are two repositories which only differ in case (pr-204, ticket-108)
+    - Fixed api/manager download links in documentation (issue-449, ticket-111)
+    - Fixed stackoverflow on (de)serialization of the history page (ticket-114)
+    - Fixed queries for milestones with hyphentated names (ticket-115)
+    - Fixed duplicate repositories on the dashboard (issue-454, ticket-117)
+    - Fixed lower-case project selection (ticket-118)
+    changes:
+    - Update Korean translation (pr-206, ticket-120)
+    - Improve web.canonicalUrl documentation (pr-205, ticket-121, issue-453)
+    additions: ~
+    dependencyChanges:
+    - Jetty 9.2.1 (pr-202)
+    - Lucene 4.8.1 (pr-201)
+    - JGit 3.4.0 (pr-200)
+    - SLF4j 1.7.7 (ticket-122)
+    - gson 2.2.2 (ticket-123)
+    - Freemarker 2.3.20 (ticket-124)
+    contributors:
+    - James Moger
+    - David Ostrovsky
+    - Kyle Gottfried
+    - Yena Hong
+    - Eric Fairon
+    - Gareth Collins
+}
+
+#
+# 1.6.0 release
+#
+r24: {
+    title: Gitblit 1.6.0 released
+    id: 1.6.0
+    date: 2014-06-16
     note: ''
           The next major release (v1.7.0) will focus on:
           * ticket-75: making projects more useful including the concept of project ownership
@@ -70,6 +108,7 @@
     - Add setting to control default thread pool size for miscellaneous background tasks (ticket-92)
     - Add Norwegian transation (pr-186)
     - Add German translation (pr-192)
+    - Add Italian translation (pr-196)
     dependencyChanges:
     - Update to javax.mail 1.5.1 (issue-417, ticket-58)
     contributors:
@@ -91,6 +130,7 @@
     - Dongsu Kim
     - Karanbir Singh
     - Tamás Papp
+    - GianMaria Romanato
     settings:
     - { name: 'web.allowDeletingNonEmptyRepositories', defaultValue: 'true' }
     - { name: 'web.includePersonalRepositories', defaultValue: 'false' }
@@ -1412,6 +1452,6 @@
 	- James Moger
 }
 
-snapshot: &r24
-release: &r23
-releases: &r[1..23]
+snapshot: ~
+release: &r24
+releases: &r[1..24]

--
Gitblit v1.9.1