Mon Mar 29 19:17:48 UTC 2010

Author: derks

Update of /cvs/pkgs/rpms/mysql-mmm/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14844/EL-5

Modified Files:
	.cvsignore import.log mysql-mmm-agent.init 
	mysql-mmm-monitor.init mysql-mmm.spec sources 
Added Files:
	mmm_agent.conf mmm_common.conf mmm_mon.conf mmm_mon_log.conf 
	mmm_tools.conf mysql-mmm-2.1.0-paths.patch 
Removed Files:
	mysql-mmm-2.0.10-default_logging.patch 
	mysql-mmm-2.0.10-lp473446.patch mysql-mmm-2.0.9-configs.patch 
	mysql-mmm-2.0.9-paths.patch 
Log Message:
* Wed Mar 10 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.2.0-1
- Latest upstream release.  Resolves LaunchPad Issues 416572, 422549,
  531011, 531841, 525719. Full ChangeLog available at:
  http://mysql-mmm.org/mmm2:changelog
- Removed Patch5: mysql-mmm-2.1.1-backward_compat.patch, sed conf files
  in pre instead (if old pid exists).

* Mon Mar 08 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.1-1
- Latest source provides minor update for DBI timeout handling
  Full changelog available: http://mysql-mmm.org/mmm2:changelog
- Agent Requires: perl-DBD-mysql.  Resolves BZ #568870
- Removed Patch4: mysql-mmm-2.0.10-default_logging.patch (applied
  upstream)
- Added Patch5: mysql-mmm-2.1.1-backward_compat.patch for backward
  compat with mmm < 2.0

* Thu Feb 25 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-3
- Fixed init scripts to check for ENABLED only within the start
  function.

* Tue Feb 23 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-2
- Added defaults file for mysql-mmm-agent and mysql-mmm-monitor
  Resolves BZ #567753
- Init scripts exit if ENABLED != 1
- Fixed typo in mysql-mmm-monitor where mmmd_mon was still referenced

* Mon Feb 22 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-1.1
- Latest sources from upstream adds a number of bug fixes.  Full
  changelog available at http://mysql-mmm.org/mmm2:changelog
- Updated init scripts to reflect new binary paths
  (i.e. mmmd_agent -> mmm_agentd)
- Updated Patch0: mysql-mmm-2.1.0-paths.patch
- Removed Patch1: mysql-mmm-2.0.9-configs.patch (added source
  config files)

* Wed Feb 17 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.0.11-2
- Rebuild for F13/devel retag

* Mon Feb 08 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.0.11-1
- Latest sources from upstream
- Removed Patch3: mysql-mmm-2.0.10-lp473446.patch (appied upstream)
- Added default mmm_mon_log.conf to allow logger modification

--- NEW FILE mmm_agent.conf ---
include mmm_common.conf

# The 'this' variable refers to this server.  Proper operation requires 
# that 'this' server (db1 by default), as well as all other servers, have the 
# proper IP addresses set in mmm_common.conf.
this db1


--- NEW FILE mmm_common.conf ---
active_master_role      writer

<host default>
    cluster_interface       eth0
    pid_path                /var/run/mysql-mmm/mmm_agentd.pid
    bin_path                /usr/libexec/mysql-mmm/
    replication_user        replicant
    replication_password    slave
    agent_user              mmm_agent
    agent_password          RepAgent
</host>

<host db1>
    ip      192.168.100.49
    mode    master
    peer    db2
</host>

<host db2>
    ip      192.168.100.50
    mode    master
    peer    db1
</host>

#<host db3>
#    ip      192.168.100.51
#    mode    slave
#</host>

<role writer>
    hosts   db1, db2
    ips     192.168.100.250
    mode    exclusive
</role>

<role reader>
    hosts   db1, db2
    ips     192.168.100.251, 192.168.100.252
    mode    balanced
</role>


--- NEW FILE mmm_mon.conf ---
include mmm_common.conf

<monitor>
    ip                  127.0.0.1
    pid_path            /var/run/mysql-mmm/mmm_mond.pid
    bin_path            /usr/libexec/mysql-mmm
    status_path         /var/lib/mysql-mmm/mmm_mond.status
    ping_ips            192.168.100.50
    auto_set_online     60

    # The kill_host_bin does not exist by default, though the monitor will
    # throw a warning about it missing.  See the section 5.10 "Kill Host 
    # Functionality" in the PDF documentation.
    #
    # kill_host_bin     /usr/libexec/mysql-mmm/monitor/kill_host
    #
</monitor>

<host default>
    monitor_user        mmm_monitor
    monitor_password    RepMonitor
</host>

debug 0


--- NEW FILE mmm_mon_log.conf ---
#log4perl.logger = FATAL, MMMLog, MailFatal
log4perl.logger = FATAL, MMMLog

log4perl.appender.MMMLog = Log::Log4perl::Appender::File
log4perl.appender.MMMLog.Threshold = INFO
log4perl.appender.MMMLog.filename = /var/log/mysql-mmm/mmm_mond.log
log4perl.appender.MMMLog.recreate = 1
log4perl.appender.MMMLog.layout = PatternLayout
log4perl.appender.MMMLog.layout.ConversionPattern = %d %5p %m%n

#log4perl.appender.MailFatal = Log::Dispatch::Email::MailSender
#log4perl.appender.MailFatal.Threshold = FATAL
#log4perl.appender.MailFatal.from = mmm at example.com
#log4perl.appender.MailFatal.to = root
#log4perl.appender.MailFatal.buffered = 0
#log4perl.appender.MailFatal.subject = FATAL error in mysql-mmm-monitor
#log4perl.appender.MailFatal.layout = PatternLayout
#log4perl.appender.MailFatal.layout.ConversionPattern = %d %m%n


--- NEW FILE mmm_tools.conf ---
include mmm_agent.conf

default_copy_method         scp
clone_dirs                  data, logs

<host default>
    ssh_user                root

    lvm_snapshot_size       1G
    lvm_logical_volume      mysql
    lvm_volume_group        storage
    lvm_mount_dir           /mmm_snapshot
    lvm_mount_opts          -orw,nouuid

    tools_user              mmm_tools
    tools_password          RepTools

    backup_dir              /mmm_backup
    restore_dir             /mysql
</host>


<copy_method scp>
    backup_command scp -c blowfish -r %SSH_USER%@%IP%:%SNAPSHOT%/%CLONE_DIR% %DEST_DIR%/
    restore_command cp -axv %BACKUP_DIR%/* %DEST_DIR%/
    true_copy 1
</copy_method>

<copy_method rdiff>
    backup_command rdiff-backup --ssh-no-compression -v 5 !--include %SNAPSHOT%/%CLONE_DIR%! --exclude %SNAPSHOT% %SSH_USER%@%IP%::%SNAPSHOT%/ %DEST_DIR%/
    restore_command rdiff-backup --force -v 5 -r %VERSION% %BACKUP_DIR% %DEST_DIR%/.mmm_restore; cp -axvl --remove-destination %DEST_DIR%/.mmm_restore/*  %DEST_DIR%/; rm -r %DEST_DIR%/.mmm_restore/
    incremental_command rdiff-backup --parsable-output -l %BACKUP_DIR%
    single_run 1
    incremental 1
</copy_method>

<copy_method ssh-gz>
    backup_command ssh -c blowfish %SSH_USER%@%IP% "cd '%SNAPSHOT%'; tar cv !'%CLONE_DIR%'!" | gzip > %DEST_DIR%/backup.tar.gz
    restore_command cd %DEST_DIR%; tar xzfv %BACKUP_DIR%/backup.tar.gz
    single_run 1
</copy_method>



mysql-mmm-2.1.0-paths.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mysql-mmm-2.1.0-paths.patch ---
--- mysql-mmm-2.1.0/Makefile.orig	2010-02-18 09:49:25.000000000 -0600
+++ mysql-mmm-2.1.0/Makefile	2010-02-22 18:10:53.000000000 -0600
@@ -4,7 +4,7 @@
 endif
 
 MODULEDIR = $(DESTDIR)$(shell eval "`perl -V:${INSTALLDIR}`"; echo "$$${INSTALLDIR}")/MMM
-BINDIR    = $(DESTDIR)/usr/lib/mysql-mmm
+BINDIR    = $(DESTDIR)/usr/libexec/mysql-mmm
 SBINDIR   = $(DESTDIR)/usr/sbin
 LOGDIR    = $(DESTDIR)/var/log/mysql-mmm
 ETCDIR    = $(DESTDIR)/etc


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Dec 2009 19:47:58 -0000	1.2
+++ .cvsignore	29 Mar 2010 19:17:46 -0000	1.3
@@ -1,2 +1,2 @@
-mysql-mmm-2.0.10-1.pdf
-mysql-mmm-2.0.10.tar.gz
+mysql-mmm-2.2.0.pdf
+mysql-mmm-2.2.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	21 Dec 2009 19:47:58 -0000	1.1
+++ import.log	29 Mar 2010 19:17:46 -0000	1.2
@@ -1 +1,2 @@
 mysql-mmm-2_0_10-4:EL-5:mysql-mmm-2.0.10-4.src.rpm:1261424863
+mysql-mmm-2_2_0-1_fc12:EL-5:mysql-mmm-2.2.0-1.fc12.src.rpm:1269890126


Index: mysql-mmm-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/EL-5/mysql-mmm-agent.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-mmm-agent.init	21 Dec 2009 19:47:58 -0000	1.1
+++ mysql-mmm-agent.init	29 Mar 2010 19:17:48 -0000	1.2
@@ -5,20 +5,27 @@
 #
 # chkconfig: - 64 36
 # description:  MMM Agent.
-# processname: mmmd_agent
+# processname: mmm_agentd
 # config: /etc/mysql-mmm/mmm_agent.conf
-# pidfile: /var/run/mysql-mmm/mmmd_agent.pid
+# pidfile: /var/run/mysql-mmm/mmm_agentd.pid
 
-# Source function library.
+# Source function library and defaults file.
 . /etc/rc.d/init.d/functions
+. /etc/default/mysql-mmm-agent
 
 # Paths
-MMMD_AGENT_BIN="/usr/sbin/mmmd_agent"
-MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmmd_agent.pid"
+MMMD_AGENT_BIN="/usr/sbin/mmm_agentd"
+MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmm_agentd.pid"
 LOCKFILE='/var/lock/subsys/mysql-mmm-agent'
 prog='MMM Agent Daemon'
 
+
 start() {
+        if [ "${ENABLED}" != "1" ]; then
+                echo "$prog is disabled!"
+                exit 1
+        fi
+
         echo -n "Starting $prog: "
         if [ -s $MMMD_AGENT_PIDFILE ] && kill -0 `cat $MMMD_AGENT_PIDFILE` 2> /dev/null; then
             echo " already running."


Index: mysql-mmm-monitor.init
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/EL-5/mysql-mmm-monitor.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-mmm-monitor.init	21 Dec 2009 19:47:58 -0000	1.1
+++ mysql-mmm-monitor.init	29 Mar 2010 19:17:48 -0000	1.2
@@ -5,12 +5,13 @@
 #
 # chkconfig: - 64 36
 # description:  MMM Monitor.
-# processname: mmmd_mon
+# processname: mmm_mond
 # config: /etc/mysql-mmm/mmm_mon.conf
-# pidfile: /var/run/mysql-mmm/mmmd_mon.pid
+# pidfile: /var/run/mysql-mmm/mmm_mond.pid
 
-# Source function library.
+# Source function library and defaults file.
 . /etc/rc.d/init.d/functions
+. /etc/default/mysql-mmm-monitor
 
 # Cluster name (it can be empty for default cases)
 CLUSTER=''
@@ -18,15 +19,18 @@ LOCKFILE='/var/lock/subsys/mysql-mmm-mon
 prog='MMM Monitor Daemon'
 
 if [ "$CLUSTER" != "" ]; then
-    MMMD_MON_BIN="/usr/sbin/mmmd_mon @$CLUSTER"
-    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon-$CLUSTER.pid"
+        MMMD_MON_BIN="/usr/sbin/mmm_mond @$CLUSTER"
+        MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmm_mond-$CLUSTER.pid"
 else 
-    MMMD_MON_BIN="/usr/sbin/mmmd_mon"
-    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon.pid"
+        MMMD_MON_BIN="/usr/sbin/mmm_mond"
+        MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmm_mond.pid"
 fi
 
-
 start() {
+        if [ "${ENABLED}" != "1" ]; then
+                echo "$prog is disabled!"
+                exit 1
+        fi
         echo -n "Starting $prog: "
         if [ -s $MMMD_MON_PIDFILE ] && kill -0 `cat $MMMD_MON_PIDFILE` 2> /dev/null; then
             echo " already running."
@@ -35,7 +39,7 @@ start() {
         daemon $MMMD_MON_BIN
         RETVAL=$?
         echo
-	[ $RETVAL = 0 ] && touch $LOCKFILE
+        [ $RETVAL = 0 ] && touch $LOCKFILE
         return $RETVAL
 }
 


Index: mysql-mmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/EL-5/mysql-mmm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-mmm.spec	21 Dec 2009 19:47:58 -0000	1.1
+++ mysql-mmm.spec	29 Mar 2010 19:17:48 -0000	1.2
@@ -1,25 +1,28 @@
 
 Name: mysql-mmm
-Version: 2.0.10 
-Release: 4%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 Summary: Multi-Master Replication Manager for MySQL
 License: GPLv2
 URL: http://mysql-mmm.org
 Group: Applications/System
 Source: http://mysql-mmm.org/_media/:mmm2:/%{name}-%{version}.tar.gz 
 Source1: mysql-mmm.logrotate
-Source2: http://mysql-mmm.org/_media/:mmm2:/%{name}-%{version}-1.pdf
+Source2: http://mysql-mmm.org/_media/:mmm2:/%{name}-%{version}.pdf
 Source3: mysql-mmm-agent.init
 Source4: mysql-mmm-monitor.init
+Source5: mmm_mon_log.conf 
+Source6: mmm_agent.conf
+Source7: mmm_mon.conf
+Source8: mmm_tools.conf
+Source9: mmm_common.conf
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 
 BuildArch: noarch
 Provides: mmm = %{version}-%{release} 
 Provides: mysql-master-master = %{version}-%{release}
 
-Patch0: mysql-mmm-2.0.9-paths.patch
-Patch1: mysql-mmm-2.0.9-configs.patch 
-Patch3: mysql-mmm-2.0.10-lp473446.patch
-Patch4: mysql-mmm-2.0.10-default_logging.patch
+Patch0: mysql-mmm-2.1.0-paths.patch
 
 %description
 MMM (MySQL Master-Master Replication Manager) is a set of flexible scripts 
@@ -36,6 +39,7 @@ Summary: MMM Database Server Agent Daemo
 Group: Applications/System
 Requires: %{name} = %{version}-%{release}
 Requires: iproute
+Requires: perl-DBD-mysql
 Provides: mysql-master-master-agent = %{version}-%{release}
 Provides: mmm-agent = %{version}-%{release}
 
@@ -63,7 +67,7 @@ Provides: mysql-master-master-tools = %{
 Provides: mmm-tools = %{version}-%{release}
 
 %description tools 
-Scripts and libraries dedicated to management of the mmmd_mon processes 
+Scripts and libraries dedicated to management of the mmm_mond processes 
 by com- mands.
 
 %prep
@@ -74,14 +78,11 @@ cp -a %{SOURCE2} . 
 cat >>README <<EOF
 Full documentation can be found at:
 
-    %{_docdir}/%{name}-%{version}/%{name}-%{version}-1.pdf
+    %{_docdir}/%{name}-%{version}/%{name}-%{version}.pdf
 EOF
 
 
 %patch0 -p1 
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
 
 
 %build
@@ -96,21 +97,75 @@ make install DESTDIR=%{buildroot}
 # additional
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d \
              %{buildroot}%{_localstatedir}/run/%{name} \
-             %{buildroot}%{_localstatedir}/lib/%{name}
+             %{buildroot}%{_localstatedir}/lib/%{name} \
+             %{buildroot}%{_datadir}/mysql-mmm
 
 install -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/logrotate.d/mysql-mmm
 
-# place our init scripts
+# Replace config files
+%{__rm} -f %{buildroot}%{_sysconfdir}/mysql-mmm/*.conf
+
+install -m 0640 %SOURCE5 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_mon_log.conf
+install -m 0640 %SOURCE6 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_agent.conf
+install -m 0640 %SOURCE7 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_mon.conf
+install -m 0640 %SOURCE8 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_tools.conf
+install -m 0640 %SOURCE9 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_common.conf
+
+# Replace our init scripts
 %{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
 %{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor
 
 install -m 0755 %SOURCE3 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
 install -m 0755 %SOURCE4 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor
 
+# Create defaults files
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/default
+
+cat >%{buildroot}%{_sysconfdir}/default/mysql-mmm-agent <<EOF
+# mysql-mmm-agent defaults
+ENABLED=1
+EOF
+
+cat >%{buildroot}%{_sysconfdir}/default/mysql-mmm-monitor <<EOF
+# mysql-mmm-monitor defaults
+ENABLED=1
+EOF
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
+%pre agent
+# For pre 2.1.0 compatibility
+if [ $1 -ge 2 ]; then
+    # check for old pid path
+    if [ -e %{_localstatedir}/run/mysql-mmm/mmmd_agent.pid ]; then
+        mv %{_localstatedir}/run/mysql-mmm/mmmd_agent.pid \
+            %{_localstatedir}/run/mysql-mmm/mmm_agentd.pid >/dev/null 2>&1 ||:
+        mv %{_localstatedir}/log/mysql-mmm/mmmd_agent.log \
+            %{_localstatedir}/log/mysql-mmm/mmm_agentd.log >/dev/null 2>&1 ||:
+        sed -i 's|mmmd_agent|mmm_agentd|g' %{_sysconfdir}/mysql-mmm/mmm_common.conf >/dev/null 2>&1 ||:
+    fi
+fi
+
+%pre monitor
+# For pre 2.1.0 compatibility
+if [ $1 -ge 2 ]; then
+    # check for old pid path
+    if [ -e %{_localstatedir}/run/mysql-mmm/mmmd_mon.pid ]; then
+        mv %{_localstatedir}/run/mysql-mmm/mmmd_mon.pid \
+            %{_localstatedir}/run/mysql-mmm/mmm_mond.pid >/dev/null 2>&1 ||:
+        mv %{_localstatedir}/log/mysql-mmm/mmmd_mon.log \
+            %{_localstatedir}/log/mysql-mmm/mmm_mond.log >/dev/null 2>&1 ||:
+        sed -i 's|mmmd_mon|mmm_mond|g' %{_sysconfdir}/mysql-mmm/mmm_mon.conf >/dev/null 2>&1 ||:
+        sed -i 's|mmmd_mon|mmm_mond|g' %{_sysconfdir}/mysql-mmm/mmm_mon_log.conf >/dev/null 2>&1 ||:
+    fi
+    # check for old status path
+    if [ -e %{_localstatedir}/lib/mysql-mmm/mmmd_mon.status ]; then
+        mv %{_localstatedir}/lib/mysql-mmm/mmmd_mon.status \
+            %{_localstatedir}/lib/mysql-mmm/mmm_mond.status >/dev/null 2>&1 ||:
+    fi
+fi
 
 %post agent
 if [ $1 -eq 1 ]; then 
@@ -121,6 +176,8 @@ elif [ $1 -ge 2 ]; then
 fi
 
 
+
+
 %post monitor
 if [ $1 -eq 1 ]; then 
     /sbin/chkconfig --add mysql-mmm-monitor 
@@ -144,11 +201,12 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING INSTALL README VERSION %{name}-%{version}-1.pdf 
+%doc COPYING INSTALL README VERSION %{name}-%{version}.pdf 
 %dir %{_sysconfdir}/mysql-mmm
 %attr(755,root,root) %dir %{_localstatedir}/lib/mysql-mmm
 %attr(755,root,root) %dir %{_localstatedir}/run/mysql-mmm
 %attr(755,root,root) %dir %{_localstatedir}/log/mysql-mmm
+%attr(755,root,root) %dir %{_datadir}/mysql-mmm
 %config(noreplace) %{_sysconfdir}/logrotate.d/mysql-mmm
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_common.conf
 %{perl_vendorlib}/MMM/Common
@@ -167,23 +225,69 @@ fi
 %defattr(-,root,root,-)
 %doc README
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_agent.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/default/mysql-mmm-agent
 %attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-agent
 %{perl_vendorlib}/MMM/Agent
 %{_libexecdir}/mysql-mmm/agent/
-%{_sbindir}/mmmd_agent
+%{_sbindir}/mmm_agentd
 
 %files monitor
 %defattr(-,root,root,-)
 %doc README
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon.conf
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon_log.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/default/mysql-mmm-monitor
 %attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-monitor
 %{perl_vendorlib}/MMM/Monitor
 %{_libexecdir}/mysql-mmm/monitor/
-%{_sbindir}/mmmd_mon
+%{_sbindir}/mmm_mond
 %{_sbindir}/mmm_control
 
 
 %changelog
+* Wed Mar 10 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.2.0-1
+- Latest upstream release.  Resolves LaunchPad Issues 416572, 422549,
+  531011, 531841, 525719. Full ChangeLog available at:
+  http://mysql-mmm.org/mmm2:changelog
+- Removed Patch5: mysql-mmm-2.1.1-backward_compat.patch, sed conf files 
+  in pre instead (if old pid exists).
+  
+* Mon Mar 08 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.1-1
+- Latest source provides minor update for DBI timeout handling
+  Full changelog available: http://mysql-mmm.org/mmm2:changelog
+- Agent Requires: perl-DBD-mysql.  Resolves BZ #568870
+- Removed Patch4: mysql-mmm-2.0.10-default_logging.patch (applied
+  upstream) 
+- Added Patch5: mysql-mmm-2.1.1-backward_compat.patch for backward
+  compat with mmm < 2.0
+
+* Thu Feb 25 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-3
+- Fixed init scripts to check for ENABLED only within the start
+  function.
+
+* Tue Feb 23 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-2
+- Added defaults file for mysql-mmm-agent and mysql-mmm-monitor
+  Resolves BZ #567753
+- Init scripts exit if ENABLED != 1
+- Fixed typo in mysql-mmm-monitor where mmmd_mon was still referenced
+
+* Mon Feb 22 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-1.1
+- Latest sources from upstream adds a number of bug fixes.  Full
+  changelog available at http://mysql-mmm.org/mmm2:changelog
+- Updated init scripts to reflect new binary paths 
+  (i.e. mmmd_agent -> mmm_agentd)
+- Updated Patch0: mysql-mmm-2.1.0-paths.patch 
+- Removed Patch1: mysql-mmm-2.0.9-configs.patch (added source 
+  config files)
+
+* Wed Feb 17 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.0.11-2
+- Rebuild for F13/devel retag
+
+* Mon Feb 08 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.0.11-1
+- Latest sources from upstream
+- Removed Patch3: mysql-mmm-2.0.10-lp473446.patch (appied upstream)
+- Added default mmm_mon_log.conf to allow logger modification
+
 * Fri Dec 04 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-4
 - Add auto_set_online to 60 in mmm_mon.conf
 - Provides full version-release for all subpackages


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Dec 2009 19:47:58 -0000	1.2
+++ sources	29 Mar 2010 19:17:48 -0000	1.3
@@ -1,2 +1,2 @@
-822a0d8819af1bcf6fb228f0ecfd3ed4  mysql-mmm-2.0.10-1.pdf
-e8b8df923eeeeae9c4f8ec5584f5023d  mysql-mmm-2.0.10.tar.gz
+b8c296f6c829e28c15b474dbcb989e45  mysql-mmm-2.2.0.pdf
+816ce41a03b60fb9efab8cd5f79a2bf2  mysql-mmm-2.2.0.tar.gz


--- mysql-mmm-2.0.10-default_logging.patch DELETED ---


--- mysql-mmm-2.0.10-lp473446.patch DELETED ---


--- mysql-mmm-2.0.9-configs.patch DELETED ---


--- mysql-mmm-2.0.9-paths.patch DELETED ---

