[pacemaker/f14/master] Prepare for another 1.1.3 update

[Andrew Beekhof]

commit 69502515c8018b123fe6618e412e76688570715e
Author: Andrew Beekhof <andrew at beekhof.net>
Date:   Thu Sep 16 09:05:29 2010 +0200

    Prepare for another 1.1.3 update

 pacemaker.spec |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/pacemaker.spec b/pacemaker.spec
index 6a5f9bd..b379aa0 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -17,8 +17,8 @@
 # We generate some docs using Publican, but its not available everywhere
 %bcond_without publican
 
-%global specversion 1
-%global upstream_version b3cb4f4a30ae
+%global specversion 2
+%global upstream_version 59347e19c5cb
 %global upstream_prefix Pacemaker-1-1-
 
 # Keep around for when/if required
@@ -310,6 +310,21 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Thu Sep 16 2010 Andrew Beekhof <andrew at beekhof.net> - 1.1.3-0.2-59347e19c5cb.hg
+- Pre-release version of 1.1.3
+  + High: crmd: Bug lf#2458 - Ensure stop actions always have the relevant resource attributes
+  + High: crmd: Ensure we activate the DC timer if we detect an alternate DC
+  + High: mcp: Correctly initialize the string containing the list of active daemons
+  + High: mcp: Fix the expansion of the pid file in the init script
+  + High: mcp: Tell chkconfig we need to shut down early on
+  + High: PE: Bug lf#2476 - Repair on-fail=block for groups and primitive resources
+  + High: PE: Do not demote resources because something that requires it can't run
+  + High: PE: Rewrite the ordering constraint logic to be simplicity, clarity and maintainability
+  + High: PE: Wait until stonith is available, don't fall back to shutdown for nodes requesting termination
+  + High: stonith: Bug lf#2461 - Prevent segfault by not looking up operations if the hashtable hasn't been initialized yet
+  + High: Stonith: Bug lf#2473 - Ensure stonith operations complete within the timeout and are terminated if they run too long
+  + High: stonith: Bug lf#2473 - Gracefully handle remote operations that arrive late (after we've done notifications)
+  + High: Tools: Bug lf#2456 - Fix assertion failure in crm_resource
 * Mon Jul 26 2010 Andrew Beekhof <andrew at beekhof.net> - 1.1.3-0.1-b3cb4f4a30ae.hg
 - Pre-release version of 1.1.3
   + High: ais: Bug lf2401 - Improved processing when the peer crmd processes join/leave