This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CDO Model Repository".

The branch, master has been updated
       via  91e8f03da5490579758e70f554d5864eb5716fe9 (commit)
       via  adbb257973866c3c389a636251cb7fe9180ff763 (commit)
       via  947126c22b8708b2b974c50e4541f4551005ac29 (commit)
       via  1e85ec5f36e5a71ac4a4490a0de8c18e8c9aa2d7 (commit)
      from  25a38d51fe42710061b0522b01a32cc1c271ce05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91e8f03da5490579758e70f554d5864eb5716fe9
Merge: adbb257 25a38d5
Author: Eike Stepper <[email protected]>
Date:   Mon Mar 19 12:21:11 2012 +0100

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
        
plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOLobUserType.java
        
plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java

commit adbb257973866c3c389a636251cb7fe9180ff763
Author: Eike Stepper <[email protected]>
Date:   Mon Mar 19 11:53:31 2012 +0100

    Enhance getText() in Eresource item providers

commit 947126c22b8708b2b974c50e4541f4551005ac29
Author: Eike Stepper <[email protected]>
Date:   Mon Mar 19 11:51:59 2012 +0100

    Make container to pull browser pages from configurable

commit 1e85ec5f36e5a71ac4a4490a0de8c18e8c9aa2d7
Author: Eike Stepper <[email protected]>
Date:   Mon Mar 19 11:38:43 2012 +0100

    [374632] NumberFormatException when converting String to CDO LOB
    https://bugs.eclipse.org/bugs/show_bug.cgi?id=374632

-----------------------------------------------------------------------

Summary of changes:
 .../provider/CDOBinaryResourceItemProvider.java    |   20 +-
 .../provider/CDOFileResourceItemProvider.java      |   18 +-
 .../provider/CDOResourceItemProvider.java          |   35 +-
 .../provider/CDOTextResourceItemProvider.java      |   20 +-
 .../hibernate/tuplizer/CDOLobUserType.java         |  300 ++--
 .../eclipse/emf/cdo/server/CDOServerBrowser.java   | 2538 ++++++++++----------
 6 files changed, 1465 insertions(+), 1466 deletions(-)


hooks/post-receive
-- 
CDO Model Repository
_______________________________________________
cdo-commit mailing list
[email protected]
http://dev.eclipse.org/mailman/listinfo/cdo-commit

Reply via email to