svn commit: r1775310 - in /manifoldcf/branches/release-2.6-branch: ./ CHANGES.txt framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java

[kwright]

Author: kwright
Date: Tue Dec 20 15:30:48 2016
New Revision: 1775310

URL: http://svn.apache.org/viewvc?rev=1775310&view=rev
Log:
Pull up fix for CONNECTORS-1362 from trunk.

Modified:
    manifoldcf/branches/release-2.6-branch/   (props changed)
    manifoldcf/branches/release-2.6-branch/CHANGES.txt
    
manifoldcf/branches/release-2.6-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java

Propchange: manifoldcf/branches/release-2.6-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 15:30:48 2016
@@ -138,4 +138,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1774667,1774670,1775304
+/manifoldcf/trunk:1774667,1774670,1775304,1775309

Modified: manifoldcf/branches/release-2.6-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/CHANGES.txt?rev=1775310&r1=1775309&r2=1775310&view=diff
==============================================================================
--- manifoldcf/branches/release-2.6-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.6-branch/CHANGES.txt Tue Dec 20 15:30:48 2016
@@ -4,6 +4,10 @@ $Id$
 
 ======================= Release 2.6 =====================
 
+CONNECTORS-1362: Don't output the stage_id field for jobs in the API.
+It's not accepted for readback.
+(Cathal Mcguinness, Karl Wright)
+
 CONNECTORS-1361: The max_interval job field was missing from the API.
 (Cathal Mcguinness, Karl Wright)
 

Modified: 
manifoldcf/branches/release-2.6-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java?rev=1775310&r1=1775309&r2=1775310&view=diff
==============================================================================
--- 
manifoldcf/branches/release-2.6-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
 (original)
+++ 
manifoldcf/branches/release-2.6-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
 Tue Dec 20 15:30:48 2016
@@ -4881,9 +4881,6 @@ public class ManifoldCF extends org.apac
     {
       child = new ConfigurationNode(JOBNODE_NOTIFICATIONSTAGE);
       ConfigurationNode stage;
-      stage = new ConfigurationNode(JOBNODE_STAGEID);
-      stage.setValue(Integer.toString(j));
-      child.addChild(child.getChildCount(),stage);
       stage = new ConfigurationNode(JOBNODE_STAGECONNECTIONNAME);
       stage.setValue(job.getNotificationConnectionName(j));
       child.addChild(child.getChildCount(),stage);