| commit | 9cb24d6d21c9e46f51ef5cfdf15a9b0b1fd000b0 | |
| author | Sérgio Miguel Fernandes <sergio.fernandes@ist.utl.pt> | |
| Fri, 25 Mar 2011 23:52:50 +0000 (25 23:52 +0000) | ||
| committer | Sérgio Miguel Fernandes <sergio.fernandes@ist.utl.pt> | |
| Fri, 25 Mar 2011 23:52:50 +0000 (25 23:52 +0000) | ||
| tree | 5c7224d14bbf7157985ba71bdb77bad5bc4988ce | treesnapshot (tar.gz zip) |
| parent | f4302d8cb8d6c4b40ba072c50a1d05829ce234bf | commitdiff |
| parent | 8ed7177c4a8cee3f1f64ecf1b8380460607186e6 | commitdiff |
Merge commit '8ed7177c4a8cee3f1f64ecf1b8380460607186e6' into jvstm-lf
Conflicts:
jvstm/src/jvstm/InevitableTransaction.java
Fri Mar 5 14:23:40 WET 2010 Ivo Anjo <ivo.anjo@ist.utl.pt>
* Optimize VBoxBody creation and bookeeping on InevitableTransaction.setBoxValue
Tue Mar 9 13:47:12 WET 2010 sergio.fernandes@ist.utl.pt
* Adapt previous optimization on VBox::setBoxValue. It cannot be applied to the concurrent commit because of incremental validation
Conflicts:
jvstm/src/jvstm/InevitableTransaction.java
Fri Mar 5 14:23:40 WET 2010 Ivo Anjo <ivo.anjo@ist.utl.pt>
* Optimize VBoxBody creation and bookeeping on InevitableTransaction.setBoxValue
Tue Mar 9 13:47:12 WET 2010 sergio.fernandes@ist.utl.pt
* Adapt previous optimization on VBox::setBoxValue. It cannot be applied to the concurrent commit because of incremental validation