Author: dwoods
Date: Wed Mar 24 17:49:36 2010
New Revision: 927131
URL: http://svn.apache.org/viewvc?rev=927131&view=rev
Log:
OPENJPA-1371 show as being fixed in 2.0.0-M3
Modified:
openjpa/branches/2.0.x/openjpa-project/CHANGES.txt
openjpa/branches/2.0.x/openjpa-project/RELEASE-NOTES.html
Modified: openjpa/branches/2.0.x/openjpa-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-project/CHANGES.txt?rev=927131&r1=927130&r2=927131&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-project/CHANGES.txt (original)
+++ openjpa/branches/2.0.x/openjpa-project/CHANGES.txt Wed Mar 24 17:49:36 2010
@@ -563,6 +563,7 @@ Bug
* [OPENJPA-1333] - Oracle driver returns incorrect update count on batched
insert
* [OPENJPA-1335] - Alternating manual delim id tests fail
* [OPENJPA-1338] - Allow comparison for VALUE(e) that maps to basic type
+ * [OPENJPA-1371] - Insert is called instead of Update when merge() with
derived Identity
Improvement
-----------
Modified: openjpa/branches/2.0.x/openjpa-project/RELEASE-NOTES.html
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-project/RELEASE-NOTES.html?rev=927131&r1=927130&r2=927131&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-project/RELEASE-NOTES.html (original)
+++ openjpa/branches/2.0.x/openjpa-project/RELEASE-NOTES.html Wed Mar 24
17:49:36 2010
@@ -858,6 +858,7 @@ in each release of OpenJPA.</P>
<li>[<a
href='https://issues.apache.org/jira/browse/OPENJPA-1333'>OPENJPA-1333</a>] -
Oracle driver returns incorrect update count on batched insert</li>
<li>[<a
href='https://issues.apache.org/jira/browse/OPENJPA-1335'>OPENJPA-1335</a>] -
Alternating manual delim id tests fail</li>
<li>[<a
href='https://issues.apache.org/jira/browse/OPENJPA-1338'>OPENJPA-1338</a>] -
Allow comparison for VALUE(e) that maps to basic type</li>
+<li>[<a
href='https://issues.apache.org/jira/browse/OPENJPA-1371'>OPENJPA-1371</a>] -
Insert is called instead of Update when merge() with derived Identity</li>
</ul>
<h4>Improvement</h4>
