From d69d73e5da5a12f279d5c0c38c871801739f33d6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 May 2014 13:31:56 -0400
Subject: [PATCH] Switch to -u from deprecated --set-upstream
---
src/site/siteindex.mkd | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/site/siteindex.mkd b/src/site/siteindex.mkd
index f72e9c1..5f58fb0 100644
--- a/src/site/siteindex.mkd
+++ b/src/site/siteindex.mkd
@@ -68,9 +68,10 @@
- Groovy push hook scripts
- Pluggable user service mechanism
- LDAP authentication with optional LDAP-controlled Team memberships
- - Redmine authentication
- - SalesForce.com authentication
- - Windows authentication
+ - Redmine authentication
+ - SalesForce.com authentication
+ - Windows authentication
+ - PAM authentication
- Custom authentication, authorization, and user management
- Rich RSS feeds
- JSON-based RPC mechanism
@@ -82,7 +83,7 @@
### Java Runtime Requirement
-Gitblit requires a Java 6 Runtime Environment (JRE) or a Java 6 Development Kit (JDK).
+Gitblit requires a Java 7 Runtime Environment (JRE) or a Java 7 Development Kit (JDK).
[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"
[git]: http://git-scm.com "Official Git Site"
--
Gitblit v1.9.1