Author: igalic
Date: Tue Jan 3 08:28:49 2012
New Revision: 1226703
URL: http://svn.apache.org/viewvc?rev=1226703&view=rev
Log:
merge r1226700:
Fix link to docs in Solaris SMF script.
author: igalic
review/backport: igalic
n.b.: This being similar to a typo did not go through STATUS.
Modified:
trafficserver/traffic/branches/3.0.x/ (props changed)
trafficserver/traffic/branches/3.0.x/proxy/config/ (props changed)
trafficserver/traffic/branches/3.0.x/rc/trafficserver.xml.in
Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 3 08:28:49 2012
@@ -1,4 +1,4 @@
/incubator/trafficserver/traffic/branches/dev:891823-915885
/trafficserver/traffic/branches/ts-291:965529-991993
/trafficserver/traffic/branches/wccp:1021790-1040544
-/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414,1152536,1153236,1154744,1155125,1171365,1175914,1196822,1196922,1209291,1213184
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414,1152536,1153236,1154744,1155125,1171365,1175914,1196822,1196922,1209291,1213184,1226700
Propchange: trafficserver/traffic/branches/3.0.x/proxy/config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 3 08:28:49 2012
@@ -1,4 +1,4 @@
/incubator/trafficserver/traffic/branches/dev/proxy/config:891823-915885
/trafficserver/traffic/branches/ts-291/proxy/config:965529-991993
/trafficserver/traffic/branches/wccp/proxy/config:1021790-1040544
-/trafficserver/traffic/trunk/proxy/config:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414,1152536,1152543,1153236,1154744,1155125,1171365,1175914
+/trafficserver/traffic/trunk/proxy/config:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414,1152536,1152543,1153236,1154744,1155125,1171365,1175914,1226700
Modified: trafficserver/traffic/branches/3.0.x/rc/trafficserver.xml.in
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/rc/trafficserver.xml.in?rev=1226703&r1=1226702&r2=1226703&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/rc/trafficserver.xml.in (original)
+++ trafficserver/traffic/branches/3.0.x/rc/trafficserver.xml.in Tue Jan 3
08:28:49 2012
@@ -93,7 +93,7 @@
</common_name>
<documentation>
<doc_link name='trafficserver.apache.org'
- uri='http://trafficserver.apache.org/docs.html'
/>
+ uri='http://trafficserver.apache.org/docs' />
</documentation>
</template>
</service>
