Merge branch 'maint-1.13.1' # Conflicts: # core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3b2c5520 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3b2c5520 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3b2c5520 Branch: refs/heads/master Commit: 3b2c5520771b4fc647863bdddd69aad6244f3c64 Parents: e78c6f0 28b9a25 Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Wed Oct 26 19:38:12 2016 +0100 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Wed Oct 26 19:38:12 2016 +0100 ---------------------------------------------------------------------- .../isis/core/runtime/system/session/IsisSessionFactory.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/3b2c5520/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java ---------------------------------------------------------------------- diff --cc core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java index 6573acf,2ab4b46..204546f --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java @@@ -22,7 -22,7 +22,8 @@@ package org.apache.isis.core.runtime.sy import java.util.List; import java.util.concurrent.Callable; +import javax.inject.Inject; + import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
