コミット: 8862ad471947b7ae5974736a75dcf7bdf1276dfa - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

コミットメタ情報

• リビジョン: 8862ad471947b7ae5974736a75dcf7bdf1276dfa (tree)
• 日時: 2015-10-22 17:19:43
• 作者: Michiro Hibari <l05102@shib...>
• コミッター: Michiro Hibari

ログメッセージ

Merge branch 'master' of https://scm.osdn.jp/gitroot/ultramonkey-l7/ultramonkey-l7-v3 into for_rhel7

Conflicts:
doc/heartbeat-ra/README

変更サマリ

• modified: README
• modified: doc/man/l7vsadm.8
• modified: doc/man/l7vsd.8
• modified: doc/mibs/ULTRAMONKEY-L7-MIB.txt
• modified: ultramonkeyl7.spec

差分

--- a/README
+++ b/README
@@ -31,6 +31,6 @@ About UltraMonkey-L7 Project
     To get more information about UltraMonkey-L7, please visit our project
     Web Site.
 
-      Software repository - http://sourceforge.jp/projects/ultramonkey-l7/
+      Software repository - http://osdn.jp/projects/ultramonkey-l7/
 
 

--- a/doc/man/l7vsadm.8
+++ b/doc/man/l7vsadm.8
@@ -320,4 +320,4 @@ Clear statistic info for snmp.
 .BR l7vsd (8)
 
 .SH AUTHOR
-UltraMonkey-L7 Project team <[e-mail]>
+UltraMonkey-L7 Project team <[e-mail]>

--- a/doc/man/l7vsd.8
+++ b/doc/man/l7vsd.8
@@ -30,4 +30,4 @@ SSL configuration file
 .BR l7vsadm (8)
 
 .SH AUTHOR
-UltraMonkey-L7 Project team <[e-mail]>
+UltraMonkey-L7 Project team <[e-mail]>

--- a/doc/mibs/ULTRAMONKEY-L7-MIB.txt
+++ b/doc/mibs/ULTRAMONKEY-L7-MIB.txt
@@ -14,7 +14,7 @@ ultramonkey-l7 MODULE-IDENTITY
     ORGANIZATION "NTT COMWARE"
     CONTACT-INFO
     "UltraMonkey-L7 Community
-     URL: http://sourceforge.jp/projects/ultramonkey-l7/"
+     URL: http://osdn.jp/projects/ultramonkey-l7/"
     DESCRIPTION
     "A MIB module for UltraMonkey-L7"
     ::= { enterprises 32132 }

--- a/ultramonkeyl7.spec
+++ b/ultramonkeyl7.spec
@@ -10,7 +10,7 @@ Version: 3.1.3
 Release: rc1%{?dist}
 License: LGPLv2.1
 Group: System Environment/Daemons
-URL: http://sourceforge.jp/projects/ultramonkey-l7/
+URL: http://osdn.jp/projects/ultramonkey-l7/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel