summaryrefslogtreecommitdiffstats
path: root/ruby-raa
diff options
context:
space:
mode:
authorPavel Vinogradov2018-12-25 16:57:04 -0500
committerPavel Vinogradov2018-12-25 16:57:04 -0500
commit976f3d7b1cc2f13b60b2f60edf361c0afd242111 (patch)
tree8f867e7d5c87627f4b6ee1e095a9376a413c5468 /ruby-raa
parentf932a4caca0575f018e6f5b67d2a2a6231b5173f (diff)
ruby-raa/ruby-2.4: conflicts with ruby-2.6
Diffstat (limited to 'ruby-raa')
-rwxr-xr-xruby-raa/ruby-2.4/CONFLICTS1
-rw-r--r--ruby-raa/ruby-2.4/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/ruby-raa/ruby-2.4/CONFLICTS b/ruby-raa/ruby-2.4/CONFLICTS
index 8bb84f6377..3c1be924dd 100755
--- a/ruby-raa/ruby-2.4/CONFLICTS
+++ b/ruby-raa/ruby-2.4/CONFLICTS
@@ -6,6 +6,7 @@ conflicts ruby-2.1
conflicts ruby-2.2
conflicts ruby-2.3
conflicts ruby-2.5
+conflicts ruby-2.6
conflicts ruby-enterprise-edition
conflicts rubygems
conflicts rake
diff --git a/ruby-raa/ruby-2.4/HISTORY b/ruby-raa/ruby-2.4/HISTORY
index 93b3a62fd5..aa5b812446 100644
--- a/ruby-raa/ruby-2.4/HISTORY
+++ b/ruby-raa/ruby-2.4/HISTORY
@@ -1,3 +1,6 @@
+2018-12-25 Pavel Vinogradov <public@sourcemage.org>
+ * CONFLICTS: added ruby-2.6
+
2018-10-18 Pavel Vinogradov <public@sourcemage.org>
* DETAILS: version 2.4.5, SECURITY_PATCH++,
(CVE-2018-16395 and CVE-2018-16396)