[Testbot] Plone 4.3 - Python 2.6 - Build # 2377 - Regression! - 0 failure(s)

jenkins at plone.org jenkins at plone.org
Mon Sep 22 16:36:44 UTC 2014


-------------------------------------------------------------------------------
Plone 4.3 - Python 2.6 - Build # 2377 - Failure!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-4.3-python-2.6/2377/


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

Repository: plone.dexterity
Branch: refs/heads/master
Date: 2014-09-22T17:59:22+02:00
Author: Jens W. Klein (jensens) <jk at kleinundpartner.at>
Commit: https://github.com/plone/plone.dexterity/commit/1a0fc172858e80a5df55b8a495476aceba9c288e

ops, cleanup after merge

Files changed:
M CHANGES.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index a5322d0..ec10b76 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,13 +4,12 @@ Changelog
 2.2.4 (unreleased)
 ------------------
 
-<<<<<<< HEAD
 - Fix the default attribute accessor to bind field to context when finding
   the field default.
   [datakurre]
-=======
-- fix: when Dexterity container or its children contains any AT content with 
-  AT references in them, any move or rename operation for the parent 
+
+- fix: when Dexterity container or its children contains any AT content with
+  AT references in them, any move or rename operation for the parent
   Dexterity object will cause AT ReferenceEngine to remove those references.
   see #20.
   [datakurre]
@@ -19,12 +18,10 @@ Changelog
   derive from other behaviors.
   [thet]
 
-- overhaul (no logic changed): 
-  pep8, sorted imports plone.api style, readability, utf8header, 
+- overhaul (no logic changed):
+  pep8, sorted imports plone.api style, readability, utf8header,
   remove bbb code (plone 3)
   [jensens]
->>>>>>> master
-
 
 2.2.3 (2014-04-15)
 ------------------
@@ -32,7 +29,6 @@ Changelog
 - Re-release 2.2.2 which was a brown bag release.
   [timo]
 
-
 2.2.2 (2014-04-13)
 ------------------
 




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


More information about the Testbot mailing list