Merge "DR AAF CADI integration"

diff --cc datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
index c085ebe,b64396b..46c4667
--- 1/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
--- 2/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
@@@ -64,9 -64,9 +64,10 @@@ public class DeliveryTask implements Ru
      private String feedid;
      private String subid;
      private int attempts;
+     private boolean followRedirects;
      private String[][] hdrs;
      private String newInvocationId;
 +    private long resumeTime;
  
  
      /**
@@@ -422,7 -408,14 +424,14 @@@
      /**
       * Get the feed ID for this delivery task
       */
 -    public String getFeedId() {
 +    String getFeedId() {
          return (feedid);
      }
+ 
+     /**
+      * Get the followRedirects for this delivery task
+      */
+     public boolean getFollowRedirects() {
+         return(followRedirects);
+     }
  }

diff --cc pom.xml
Simple merge