Merge pull request Netflix#645 from mattrjacobs/remove-async-timeout-…

…from-javadoc Remove incorrect reference to async timeout
axiak · Feb 6, 2015 · 10c221a · 10c221a
2 parents 7c1e880 + 7b5a3c7
commit 10c221a
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommand.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommand.java
@@ -367,8 +367,6 @@ final public Future<R> queue() {
          * We use the 'immediate' schedule since Future.get() is blocking so we don't want to bother doing the callback to the Future on a separate thread
          * as we don't need to separate the Hystrix thread from user threads since they are already providing it via the Future.get() call.
          * 
-         * --- performAsyncTimeout: false
-         * 
          * We pass 'false' to tell the Observable we will block on it so it doesn't schedule an async timeout.
          * 
          * This optimizes for using the calling thread to do the timeout rather than scheduling another thread.