summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2018-11-25 22:03:36 +0100
committerBernhard Fröhlich <bernhard@cacert.org>2018-11-25 22:03:36 +0100
commit127313c21867490481992d74b28c88147c48873e (patch)
tree4282ead026302823429ffd88faef6e81c239e634
parent9024f14b2b54b3f8b7bbda6e828b47bc590cc03f (diff)
downloadcacert-devel-127313c21867490481992d74b28c88147c48873e.tar.gz
cacert-devel-127313c21867490481992d74b28c88147c48873e.tar.xz
cacert-devel-127313c21867490481992d74b28c88147c48873e.zip
Adjusted feed.rss
-rw-r--r--pages/index/feed.rss17
1 files changed, 4 insertions, 13 deletions
diff --git a/pages/index/feed.rss b/pages/index/feed.rss
index 3605f26..40f26b5 100644
--- a/pages/index/feed.rss
+++ b/pages/index/feed.rss
@@ -9,22 +9,13 @@
<language>en</language>
<item>
- <title>Usage of integration branch</title>
+ <title>Testcampaign 1260 and children</title>
<description>
- This is the <b>integration branch</b>. If it is not, please change this message in pages/index/feed.rss
+ This is the branch to test bug-1260 and its children.
- The integration branch is used as the base branch for the testserver. Ideally it should differ
- from the release branch only in the explicit changes for the testserver (other icon and styles).
-
- For a test campaign you should create a new branch (something like "testserver-&lt;campaign name&gt;")
- and merge in the bug-branches which are to be tested in the campaign. After the campaign is
- finished the testserver should be reverted to the integration branch.
-
- If a patch is handed off to critical to be installed on the production system, the patch is
- usually also merged into the release branch (so it continues to mirror the production system).
- Then the patch should also be merged into the integration branch for the same reason.
+ Merged in children are bug-1442 and bug-1444.
</description>
- <link>https://wiki.cacert.org/Software/Assessment/testserver/setup#Changes_to_the_release_branch</link>
+ <link>https://bugs.cacert.org/view.php?id=1260</link>
</item>
</channel>
</rss>