[Testbot] Plone 4.3 - Python 2.7 - Build # 2580 - Still failing! - 66 failure(s)

[jenkins at plone.org]

-------------------------------------------------------------------------------
Plone 4.3 - Python 2.7 - Build # 2580 - Still Failing!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-4.3-python-2.7/2580/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-09-29T06:25:58+02:00
Author: Timo Stollenwerk () <contact at timostollenwerk.net>
Commit: https://github.com/plone/plone.app.contenttypes/commit/9df91de6c00260cdd566d80e904f5133032dca00

Revert "Added missing types to CMFDiffTool configuration"

This reverts commit 55e7dff5b454a2bdc9134f67159f049e66534860.

This commit broke the Plone 4.3 build: http://jenkins.plone.org/job/plone-4.3-python-2.7/2579/

Files changed:
M docs/CHANGES.rst
M plone/app/contenttypes/profiles/default/diff_tool.xml

diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index 392f049..bbe829c 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -4,8 +4,7 @@ Changelog
 1.2a5 (unreleased)
 ------------------
 
-- Fix: Added missing types to CMFDiffTool configuraion.
-  [jensens]
+- Nothing changed yet.
 
 
 1.2a4 (2014-09-17)
diff --git a/plone/app/contenttypes/profiles/default/diff_tool.xml b/plone/app/contenttypes/profiles/default/diff_tool.xml
index 834b9b6..836bb33 100644
--- a/plone/app/contenttypes/profiles/default/diff_tool.xml
+++ b/plone/app/contenttypes/profiles/default/diff_tool.xml
@@ -7,15 +7,6 @@
     <type portal_type="Event">
       <field name="any" difftype="Compound Diff for Dexterity types"/>
     </type>
-    <type portal_type="File">
-      <field name="any" difftype="Compound Diff for Dexterity types"/>
-    </type>
-    <type portal_type="Folder">
-      <field name="any" difftype="Compound Diff for Dexterity types"/>
-    </type>
-    <type portal_type="Image">
-      <field name="any" difftype="Compound Diff for Dexterity types"/>
-    </type>
     <type portal_type="Link">
       <field name="any" difftype="Compound Diff for Dexterity types"/>
     </type>




-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 1752 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140929/5528eb50/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 276003 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140929/5528eb50/attachment-0003.obj>