diff options
author | Treeve Jelbert | 2015-12-26 13:33:08 +0100 |
---|---|---|
committer | Treeve Jelbert | 2015-12-26 13:33:08 +0100 |
commit | 630f731b97ede3fa0a70cb662041dcaf90faf7f4 (patch) | |
tree | fe0319a15beef1dd67f2f0dae1c71509f08eeb7a /ruby-raa | |
parent | b5e73b3a8f10e37dab6412a4ea0c350b2180e3e2 (diff) |
ruby-2.2 - extra conflict
Diffstat (limited to 'ruby-raa')
-rwxr-xr-x | ruby-raa/ruby-2.2/CONFLICTS | 1 | ||||
-rw-r--r-- | ruby-raa/ruby-2.2/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ruby-raa/ruby-2.2/CONFLICTS b/ruby-raa/ruby-2.2/CONFLICTS index bfd52c01f7..92837896ac 100755 --- a/ruby-raa/ruby-2.2/CONFLICTS +++ b/ruby-raa/ruby-2.2/CONFLICTS @@ -3,4 +3,5 @@ conflicts ruby-1.8 conflicts ruby-1.9 conflicts ruby-2.0 conflicts ruby-2.1 +conflicts ruby-2.3 conflicts ruby-enterprise-edition diff --git a/ruby-raa/ruby-2.2/HISTORY b/ruby-raa/ruby-2.2/HISTORY index 9ec072ca3a..5238b30b83 100644 --- a/ruby-raa/ruby-2.2/HISTORY +++ b/ruby-raa/ruby-2.2/HISTORY @@ -1,3 +1,6 @@ +2015-12-25 Treeve Jelbert <treeve@sourcemage.org> + * CONFLICTS: add ruby-2.3 + 2015-12-18 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.2.4 SECURITY_PATCH++ fixes CVE-2015-7551 |