summaryrefslogtreecommitdiffstats
path: root/ruby-raa
diff options
context:
space:
mode:
authorPavel Vinogradov2017-12-26 14:13:59 -0500
committerPavel Vinogradov2017-12-26 14:13:59 -0500
commit6720308d432c78706c4127b88718694264d6e5b0 (patch)
treecd5f38e4bde336f6b35918aa73a348f517b3a2a2 /ruby-raa
parente41f925035c339f20ce2ee3c0e7c0b6fd9911d8b (diff)
ruby-raa/ruby-2.3: conflicts with ruby-2.5
Diffstat (limited to 'ruby-raa')
-rwxr-xr-xruby-raa/ruby-2.3/CONFLICTS1
-rw-r--r--ruby-raa/ruby-2.3/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/ruby-raa/ruby-2.3/CONFLICTS b/ruby-raa/ruby-2.3/CONFLICTS
index 4525617d7d..feefa61ebe 100755
--- a/ruby-raa/ruby-2.3/CONFLICTS
+++ b/ruby-raa/ruby-2.3/CONFLICTS
@@ -5,6 +5,7 @@ conflicts ruby-2.0
conflicts ruby-2.1
conflicts ruby-2.2
conflicts ruby-2.4
+conflicts ruby-2.5
conflicts ruby-enterprise-edition
conflicts rubygems
conflicts rake
diff --git a/ruby-raa/ruby-2.3/HISTORY b/ruby-raa/ruby-2.3/HISTORY
index c83c7614b5..2a21350223 100644
--- a/ruby-raa/ruby-2.3/HISTORY
+++ b/ruby-raa/ruby-2.3/HISTORY
@@ -1,3 +1,6 @@
+2017-12-26 Pavel Vinogradov <public@sourcemage.org>
+ * CONFLICTS: added ruby-2.5
+
2017-12-14 Pavel Vinogradov <public@sourcemage.org>
* DETAILS: version 2.3.6, SECURITY_PATCH++,
(CVE-2017-17405), reorganized urls