Branch: refs/heads/master Home: https://github.com/weld/core Commit: 7d8bddc8fbddaedc0b0cfaa3a08ca3213fd2ba43 https://github.com/weld/core/commit/7d8bddc8fbddaedc0b0cfaa3a08ca3213fd2ba43 Author: Tomas Remes <tremes(a)redhat.com&gt; Date: 2016-03-08 (Tue, 08 Mar 2016) Changed paths: M docs/reference/src/main/asciidoc/configure.asciidoc M docs/reference/src/main/asciidoc/scopescontexts.asciidoc M impl/src/main/java/org/jboss/weld/bootstrap/WeldStartup.java M impl/src/main/java/org/jboss/weld/config/ConfigurationKey.java M impl/src/main/java/org/jboss/weld/context/AbstractConversationContext.java M impl/src/main/java/org/jboss/weld/context/bound/BoundConversationContextImpl.java M modules/web/src/main/java/org/jboss/weld/context/http/HttpConversationContextImpl.java M modules/web/src/main/java/org/jboss/weld/context/http/LazyHttpConversationContextImpl.java M modules/web/src/main/java/org/jboss/weld/web/WeldWebModule.java A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/concurrent/ConversationLockTimeoutTest.java A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/concurrent/InspectServlet.java A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/concurrent/OuterFilter.java A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/concurrent/StateHolder.java A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/timeout/concurrent/web.xml Log Message: ----------- WELD-2113 introduce configuration properties for conversation timeout and conversation conccurent access timeout.