[Rt-commit] rtir branch, 2.6-trunk, updated. 2.6.2rc1-8-gcea4255

[Kevin Falcone]

The branch, 2.6-trunk has been updated
       via  cea42559ad8b851b99fda2bb6f5dd0bf67c6ee95 (commit)
       via  45c558f824e46033333e79147f728a03e2ce3135 (commit)
       via  2271c65d13a36582eddaf6376a87dc33e51d0cb7 (commit)
       via  fece9ae54132c54b9ad87b9bc2d8e66d35798173 (commit)
      from  b34cb0509700797b3da95d6f68828e609ac2d13e (commit)

Summary of changes:
 Makefile.PL                     | 4 ++--
 html/RTIR/Incident/Display.html | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit cea42559ad8b851b99fda2bb6f5dd0bf67c6ee95
Merge: b34cb05 45c558f
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Thu Aug 30 13:41:59 2012 -0400

    Merge branch '2.6/custom-field-display' into 2.6-trunk
    
    Conflicts:
    	Makefile.PL

diff --cc Makefile.PL
index e340bf6,4937e49..f160f57
--- a/Makefile.PL
+++ b/Makefile.PL
@@@ -7,11 -7,8 +7,11 @@@ version_from('lib/RT/IR.pm')
  
  { # check RT version
      my @v = split /\./, "$RT::VERSION";
 +    if ($v[0] >= 4) {
 +        die "\n\nThis version of RTIR doesn't work with RT 4.x, you have $RT::VERSION";
 +    }
-     unless ($v[0]>=3 && $v[1]>=8 && ($v[2]>=3 || $v[2]eq'HEAD')) {
-         die "\n\nThis version of RTIR needs RT 3.8.3 at least, but don't work with RT 4.x, you have $RT::VERSION";
+     unless ($v[0]>=3 && $v[1]>=8 && ($v[2]>=6 || $v[2]eq'HEAD')) {
+         die "Current RTIR version needs RT 3.8.6 at least, you have $RT::VERSION";
      }
  }
  

-----------------------------------------------------------------------