[Rt-commit] [rtir] 01/01: Merge branch '3.2-trunk'

[Kevin Falcone]

This is an automated email from the git hooks/post-receive script.

falcone pushed a commit to branch master
in repository rtir.

commit 8a53f98d691b4886331c80a295de9c10fd55b2d5
Merge: c582a33 94ed39c
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Oct 7 12:24:16 2014 -0400

    Merge branch '3.2-trunk'
    
    Conflicts:
    	META.yml
    	lib/RT/IR.pm

 MANIFEST                                    |   1 +
 META.yml                                    |   2 +-
 README                                      |  37 ++---
 bin/add_constituency.in                     |  18 ++-
 docs/AdministrationTutorial.pod             |   6 +-
 docs/Constituencies.pod                     |  17 +++
 docs/UPGRADING                              |   9 +-
 docs/UPGRADING-3.0                          |  20 +++
 docs/UPGRADING-3.2                          |   2 +-
 etc/upgrade/2.9.0/content                   |  24 ++++
 html/RTIR/Advanced.html                     |   6 +-
 html/RTIR/Tools/Elements/ToolFormTraceroute |   4 +
 html/RTIR/Tools/Traceroute.html             |  16 ++-
 inc/Module/Install/RTx.pm                   |   2 +-
 lib/RT/IR.pm                                |   1 -
 lib/RT/IR/Config.pm                         |  10 ++
 t/constituency/basics.t                     |   6 +-
 t/constituency/visibility.t                 | 204 ++++++++++++++++++++++++++++
 t/upgrade/2.6.0-to-2.9.0.t                  |  12 +-
 19 files changed, 340 insertions(+), 57 deletions(-)

diff --cc META.yml
index a33ec4e,2703bd0..9a41ce7
--- a/META.yml
+++ b/META.yml
@@@ -32,7 -32,7 +32,7 @@@ requires
    perl: 5.10.1
  resources:
    license: http://opensource.org/licenses/gpl-license.php
 -version: 3.2.HEAD
 +version: 3.3.HEAD
- x_module_install_rtx_version: 0.35_01
+ x_module_install_rtx_version: '0.36'
  x_requires_rt: 4.2.7
  x_rt_too_new: 4.4.0
diff --cc lib/RT/IR.pm
index 6686ee4,f7c780b..835e466
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@@ -52,9 -52,9 +52,8 @@@ use warnings
  
  package RT::IR;
  
 -our $VERSION = '3.2.HEAD';
 -
 +our $VERSION = '3.3.HEAD';
  
- 
  use Scalar::Util qw(blessed);
  
  

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.