From 89dee2750330d4e19a3f2142ce0b33b00e22c053 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Tue, 26 Feb 2013 12:25:30 -0800 Subject: [PATCH 01/35] CLOUDSTACK-1414: Reduce arping time to nearly 0 In the previous version it would take at least 1 seconds for arping, and it would be big if the VR has more than 30 IPs - our biglock default timeout is 30 seconds. Fix it by send out two arping immediately, and then sleep 1 second for router to update arp cache. --- .../config/root/redundant_router/arping_gateways.sh.templ | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ b/patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ index 176bce22559..931c95901c8 100644 --- a/patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ +++ b/patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ @@ -22,6 +22,8 @@ do while read line do ip=`echo $line|cut -d " " -f 2|cut -d "/" -f 1` - arping -I $i -A $ip -c 2 >> [RROUTER_LOG] 2>&1 + arping -I $i -A $ip -c 1 >> [RROUTER_LOG] 2>&1 + arping -I $i -A $ip -c 1 >> [RROUTER_LOG] 2>&1 done < /tmp/iplist_$i done < /tmp/iflist +sleep 1 From cf06861c9bf883f2ca1ec818fe7bd4ad26b84318 Mon Sep 17 00:00:00 2001 From: Min Chen Date: Tue, 26 Feb 2013 15:08:30 -0800 Subject: [PATCH 02/35] CLOUDSTACK-1387: fix incorrect commit d37ed18c3aff4fe522adb803322ba912819c73da. --- client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/pom.xml b/client/pom.xml index 255b6adfe0a..b485be53805 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -275,7 +275,7 @@ - + From 3902f505ee8dbf11047687718a7299b31ee7d998 Mon Sep 17 00:00:00 2001 From: David Nalley Date: Tue, 26 Feb 2013 20:50:10 -0500 Subject: [PATCH 03/35] CLOUDSTACK-1420 - updating publican brand files with text notice of trademarks --- docs/publican-cloudstack/defaults.cfg | 2 +- docs/publican-cloudstack/en-US/Legal_Notice.xml | 9 +++++++++ docs/publican-cloudstack/publican-cloudstack.spec | 6 ++++-- tools/apidoc/generateadmincommands.xsl | 8 ++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/docs/publican-cloudstack/defaults.cfg b/docs/publican-cloudstack/defaults.cfg index 6aebaee5a83..9e27bdd309d 100644 --- a/docs/publican-cloudstack/defaults.cfg +++ b/docs/publican-cloudstack/defaults.cfg @@ -16,6 +16,6 @@ # specific language governing permissions and limitations # under the License. -doc_url: "http://docs.cloudstack.org" +doc_url: "http://incubator.apache.org/cloudstack/docs" prod_url: "http://cloudstack.org" diff --git a/docs/publican-cloudstack/en-US/Legal_Notice.xml b/docs/publican-cloudstack/en-US/Legal_Notice.xml index 0e4be5bf56a..5e30efb07c0 100644 --- a/docs/publican-cloudstack/en-US/Legal_Notice.xml +++ b/docs/publican-cloudstack/en-US/Legal_Notice.xml @@ -53,6 +53,15 @@ completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. + + + CloudStack® is a registered trademark of the Apache Software Foundation. + + + + Apache CloudStack, the CloudStack word design, the Apache CloudStack word design, and the cloud monkey logo are trademarks of the + Apache Software Foundation. + diff --git a/docs/publican-cloudstack/publican-cloudstack.spec b/docs/publican-cloudstack/publican-cloudstack.spec index 1e70765facd..9ec15d0254f 100644 --- a/docs/publican-cloudstack/publican-cloudstack.spec +++ b/docs/publican-cloudstack/publican-cloudstack.spec @@ -18,7 +18,7 @@ Name: publican-cloudstack Summary: Common documentation files for Apache %{brand} -Version: 0.4 +Version: 0.5 Release: 1%{?dist} License: ASLv2 Group: Applications/Text @@ -49,12 +49,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README %doc LICENSE %doc NOTICE %{_datadir}/publican/Common_Content/%{brand} %changelog +* Tue Feb 29 2013 David Nalley 0.5-1 +- adding trademark information + * Sun Sep 22 2012 David Nalley 0.4-1 - added 'Apache' to the description - moved the issue tracker url to the ASF jira instance diff --git a/tools/apidoc/generateadmincommands.xsl b/tools/apidoc/generateadmincommands.xsl index 3e9c6c598fa..a33e7baf20d 100644 --- a/tools/apidoc/generateadmincommands.xsl +++ b/tools/apidoc/generateadmincommands.xsl @@ -138,8 +138,16 @@ version="1.0"> +