Merge branch 'stable-2.11' into stable-2.12

* stable-2.11:
  Add correct license for asciidoctor
  SshDaemon: Set up the session timeout to make sshd.idleTimeout work

Change-Id: If8fd11f198345d6a92fff3fa64851bd0e2b3376d

lib/BUCK

@@ -7,6 +7,7 @@ define_license(name = 'MPL1.1')
 define_license(name = 'PublicDomain')
 define_license(name = 'antlr')
 define_license(name = 'args4j')
+define_license(name = 'asciidoctor')
 define_license(name = 'automaton')
 define_license(name = 'bouncycastle')
 define_license(name = 'clippy')

lib/LICENSE-asciidoctor

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (C) 2012-2016 Dan Allen, Ryan Waldron and the Asciidoctor Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

lib/asciidoctor/BUCK

@@ -45,7 +45,7 @@ maven_jar(
   name = 'asciidoctor',
   id = 'org.asciidoctor:asciidoctorj:1.5.2',
   sha1 = '39d33f739ec1c46f6e908a725264eb74b23c9f99',
-  license = 'Apache2.0',
+  license = 'asciidoctor',
   visibility = [],
   attach_source = False,
 )