Merge pull request #1 from ReactiveX/2.x

同步 2.x

.gitignore

@@ -70,9 +70,6 @@ bin/
 *.cache
 /.nb-gradle/private/
 
-#PMD files
+# PMD files
 .pmd
 .ruleset
-
-#Android Studio
-local.properties

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 jdk:
-- oraclejdk7
+- openjdk8
 
 # force upgrade Java8 as per https://github.com/travis-ci/travis-ci/issues/4042 (fixes compilation issue)
 #addons:
@@ -10,16 +10,17 @@ jdk:
 
 # prevent travis running gradle assemble; let the build script do it anyway
 install: true
-
+
+# running in container causes test failures and 2x-3x longer build, use standalone instances
 sudo: required
-# as per http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
 
 # script for build and release via Travis to Bintray
 script: gradle/buildViaTravis.sh
 
 # Code coverage
 after_success:
   - bash <(curl -s https://codecov.io/bash)
+  - bash gradle/push_javadoc.sh
 
 # cache between builds
 cache:

CONTRIBUTING.md

@@ -6,7 +6,7 @@ When submitting code, please make every effort to follow existing conventions an
 
 ## License
 
-By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/ReactiveX/RxJava/blob/master/LICENSE
+By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/ReactiveX/RxJava/blob/2.x/LICENSE
 
 All files are released with the Apache 2.0 license.
 

HEADER

@@ -0,0 +1,10 @@
+Copyright (c) 2016-present, RxJava Contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+the License for the specific language governing permissions and limitations under the License.

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2012 Netflix, Inc.
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.