polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From paulmer...@apache.org
Subject [2/2] zest-qi4j git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/zest-qi4j into develop
Date Fri, 10 Jul 2015 09:34:29 GMT
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/zest-qi4j into develop

Conflicts:
	core/runtime/src/test/java/org/qi4j/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/0079367b
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/0079367b
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/0079367b

Branch: refs/heads/develop
Commit: 0079367bc0590af43299929d525466d99d586a90
Parents: 141dc5c 4076eae
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Fri Jul 10 11:33:55 2015 +0200
Committer: Paul Merlin <paulmerlin@apache.org>
Committed: Fri Jul 10 11:33:55 2015 +0200

----------------------------------------------------------------------
 build.gradle                                    |  4 +-
 libraries/conversion/src/docs/conversion.txt    |  7 +-
 .../conversion/values/EntityToValue.java        |  3 +
 .../values/EntityToValueAssembler.java          |  2 +
 .../conversion/values/EntityToValueService.java |  2 +
 .../conversion/values/ValueToEntity.java        |  1 +
 .../values/ValueToEntityAssembler.java          |  2 +
 .../conversion/values/ValueToEntityMixin.java   |  2 +
 .../conversion/values/ValueToEntityService.java |  2 +
 libraries/http/src/docs/http.txt                |  4 --
 .../src/docs/invocation-cache.txt               | 69 +++++++++++++++++++-
 .../CacheInvocationResultSideEffect.java        | 62 ------------------
 .../InvalidateCacheOnSettersSideEffect.java     | 53 ---------------
 .../invocationcache/InvocationCache.java        |  3 +
 .../InvocationCacheAbstractComposite.java       | 32 ---------
 .../invocationcache/InvocationCacheMixin.java   | 60 -----------------
 .../ReturnCachedValueConcern.java               | 26 ++++----
 .../ReturnCachedValueOnExceptionConcern.java    | 33 +++++-----
 .../SimpleInvocationCacheMixin.java             | 69 ++++++++++++++++++++
 .../invocationcache/DocumentationSupport.java   | 51 +++++++++++++++
 libraries/locking/dev-status.xml                |  2 +-
 libraries/locking/src/docs/locking.txt          | 39 ++++++++++-
 .../qi4j/library/locking/ReadLockConcern.java   |  5 +-
 .../qi4j/library/locking/WriteLockConcern.java  | 13 +---
 .../library/locking/DocumentationSupport.java   | 42 ++++++++++++
 manual/src/docs/userguide/libraries.txt         |  4 ++
 26 files changed, 327 insertions(+), 265 deletions(-)
----------------------------------------------------------------------



Mime
View raw message