killbill-memoizeit

diff --git a/beatrix/src/main/java/com/ning/billing/beatrix/glue/ExternalPersistentBusConfig.java b/beatrix/src/main/java/com/ning/billing/beatrix/glue/ExternalPersistentBusConfig.java
index 3ccc80c..e82c05e 100644
--- a/beatrix/src/main/java/com/ning/billing/beatrix/glue/ExternalPersistentBusConfig.java
+++ b/beatrix/src/main/java/com/ning/billing/beatrix/glue/ExternalPersistentBusConfig.java
@@ -50,6 +50,11 @@ public class ExternalPersistentBusConfig extends PersistentBusConfig {
     }
 
     @Override
+    public int getMaxFailureRetries() {
+        return externalPersistentBusConfig.getMaxFailureRetries();
+    }
+
+    @Override
     public int getMaxEntriesClaimed() {
         return externalPersistentBusConfig.getMaxEntriesClaimed();
     }

diff --git a/beatrix/src/main/resources/com/ning/billing/beatrix/ddl.sql b/beatrix/src/main/resources/com/ning/billing/beatrix/ddl.sql
index b334e44..61c0e1c 100644
--- a/beatrix/src/main/resources/com/ning/billing/beatrix/ddl.sql
+++ b/beatrix/src/main/resources/com/ning/billing/beatrix/ddl.sql
@@ -11,6 +11,7 @@ CREATE TABLE bus_ext_events (
     processing_owner char(50) DEFAULT NULL,
     processing_available_date datetime DEFAULT NULL,
     processing_state varchar(14) DEFAULT 'AVAILABLE',
+    error_count int(11) unsigned DEFAULT 0,
     search_key1 int(11) unsigned default null,
     search_key2 int(11) unsigned default null,
     PRIMARY KEY(record_id)
@@ -29,6 +30,7 @@ CREATE TABLE bus_ext_events_history (
     processing_owner char(50) DEFAULT NULL,
     processing_available_date datetime DEFAULT NULL,
     processing_state varchar(14) DEFAULT 'AVAILABLE',
+    error_count int(11) unsigned DEFAULT 0,
     search_key1 int(11) unsigned default null,
     search_key2 int(11) unsigned default null,
     PRIMARY KEY(record_id)

diff --git a/pom.xml b/pom.xml
index 05d2620..ec5c0fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>com.ning.billing</groupId>
-        <version>0.5.19</version>
+        <version>0.5.21</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.8.10-SNAPSHOT</version>

diff --git a/util/src/main/resources/com/ning/billing/util/ddl.sql b/util/src/main/resources/com/ning/billing/util/ddl.sql
index b52df6f..c32c386 100644
--- a/util/src/main/resources/com/ning/billing/util/ddl.sql
+++ b/util/src/main/resources/com/ning/billing/util/ddl.sql
@@ -159,6 +159,7 @@ CREATE TABLE notifications (
     processing_owner char(50) DEFAULT NULL,
     processing_available_date datetime DEFAULT NULL,
     processing_state varchar(14) DEFAULT 'AVAILABLE',
+    error_count int(11) unsigned DEFAULT 0,
     search_key1 int(11) unsigned default null,
     search_key2 int(11) unsigned default null,
     queue_name char(64) NOT NULL,
@@ -182,6 +183,7 @@ CREATE TABLE notifications_history (
     processing_owner char(50) DEFAULT NULL,
     processing_available_date datetime DEFAULT NULL,
     processing_state varchar(14) DEFAULT 'AVAILABLE',
+    error_count int(11) unsigned DEFAULT 0,
     search_key1 int(11) unsigned default null,
     search_key2 int(11) unsigned default null,
     queue_name char(64) NOT NULL,
@@ -201,6 +203,7 @@ CREATE TABLE bus_events (
     processing_owner char(50) DEFAULT NULL,
     processing_available_date datetime DEFAULT NULL,
     processing_state varchar(14) DEFAULT 'AVAILABLE',
+    error_count int(11) unsigned DEFAULT 0,
     search_key1 int(11) unsigned default null,
     search_key2 int(11) unsigned default null,
     PRIMARY KEY(record_id)
@@ -219,6 +222,7 @@ CREATE TABLE bus_events_history (
     processing_owner char(50) DEFAULT NULL,
     processing_available_date datetime DEFAULT NULL,
     processing_state varchar(14) DEFAULT 'AVAILABLE',
+    error_count int(11) unsigned DEFAULT 0,
     search_key1 int(11) unsigned default null,
     search_key2 int(11) unsigned default null,
     PRIMARY KEY(record_id)