Project

General

Profile

« Previous | Next » 

Revision e5613bc6

IDe5613bc6aaf6093a15e0a9c255059c26b4d3dba0
Parent 824de5d7, d0c20ea1
Child 0cc4fbec

Added by Francois POIROTTE over 11 years ago

Merge remote branch 'origin/release-2.0'

Conflicts:
collector-enterprise/VERSION.txt
collector-telnet/setup.py
collector/VERSION.txt
common/setup.py
connector-ftp/setup.py
connector-metro/setup.py
connector-nagios/setup.py
connector-rrdreport/setup.py
connector-script/setup.py
connector-syncevents/setup.py
connector-vigiconf/setup.py
connector/setup.py
correlator-enterprise/setup.py
correlator/setup.py
models/setup.py
nagios-plugins-enterprise/VERSION.txt
nagios-plugins/VERSION.txt
perfdata2vigilo/VERSION.txt
pubsub/setup.py
replication/VERSION.txt
setup/VERSION.txt
themes-default/setup.py
trap/VERSION.txt
turbogears/setup.py
vigiadmin/setup.py
vigiboard/setup.py
vigiconf-enterprise/setup.py
vigiconf-local/setup.py
vigiconf/setup.py
vigigraph-enterprise/setup.py
vigigraph/setup.py
vigimap/setup.py
vigirrd/setup.py

Change-Id: I20830d5e283e45b1532a09c01789810263a789df

Files

  • added
  • modified
  • copied
  • renamed
  • deleted