Repository: kafka Updated Branches: refs/heads/trunk d1546960d -> 801fee89d
MINOR: cleanup apache license in python files ijuma As discussed in https://github.com/apache/kafka/pull/1645, this patch removes an extraneous line from several __init__.py files, and a few others as well Author: Geoff Anderson <[email protected]> Reviewers: Ismael Juma <[email protected]> Closes #1659 from granders/minor-cleanup-init-files Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/801fee89 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/801fee89 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/801fee89 Branch: refs/heads/trunk Commit: 801fee89d801e6d222c7b1b76a97847ecc9f10ff Parents: d154696 Author: Geoff Anderson <[email protected]> Authored: Tue Jul 26 03:04:13 2016 +0100 Committer: Ismael Juma <[email protected]> Committed: Tue Jul 26 03:04:13 2016 +0100 ---------------------------------------------------------------------- config/server.properties | 1 + tests/kafkatest/__init__.py | 1 - tests/kafkatest/benchmarks/core/__init__.py | 1 - tests/kafkatest/benchmarks/streams/__init__.py | 1 - tests/kafkatest/services/__init__.py | 1 - tests/kafkatest/services/kafka/config.py | 5 ----- tests/kafkatest/services/kafka/templates/kafka.properties | 3 +-- tests/kafkatest/services/templates/console_consumer.properties | 1 - tests/kafkatest/services/templates/zookeeper.properties | 3 +-- tests/kafkatest/tests/__init__.py | 1 - tests/kafkatest/tests/client/__init__.py | 1 - tests/kafkatest/tests/connect/__init__.py | 1 - tests/kafkatest/tests/core/__init__.py | 1 - tests/kafkatest/tests/tools/__init__.py | 1 - tests/kafkatest/utils/__init__.py | 1 - tests/setup.py | 1 - vagrant/aws/aws-access-keys-commands | 1 - vagrant/aws/aws-example-Vagrantfile.local | 1 - vagrant/aws/aws-init.sh | 1 - vagrant/system-test-Vagrantfile.local | 3 +-- 20 files changed, 4 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/config/server.properties ---------------------------------------------------------------------- diff --git a/config/server.properties b/config/server.properties index aebcb87..d1b1753 100644 --- a/config/server.properties +++ b/config/server.properties @@ -12,6 +12,7 @@ # 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. + # see kafka.server.KafkaConfig for additional details and defaults ############################# Server Basics ############################# http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/__init__.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py index 10163a0..7975b8f 100644 --- a/tests/kafkatest/__init__.py +++ b/tests/kafkatest/__init__.py @@ -12,7 +12,6 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults # This determines the version of kafkatest that can be published to PyPi and installed with pip # http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/benchmarks/core/__init__.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/benchmarks/core/__init__.py b/tests/kafkatest/benchmarks/core/__init__.py index ebc9bb3..ec20143 100644 --- a/tests/kafkatest/benchmarks/core/__init__.py +++ b/tests/kafkatest/benchmarks/core/__init__.py @@ -12,4 +12,3 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/benchmarks/streams/__init__.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/benchmarks/streams/__init__.py b/tests/kafkatest/benchmarks/streams/__init__.py index ebc9bb3..ec20143 100644 --- a/tests/kafkatest/benchmarks/streams/__init__.py +++ b/tests/kafkatest/benchmarks/streams/__init__.py @@ -12,4 +12,3 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/services/__init__.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/services/__init__.py b/tests/kafkatest/services/__init__.py index ebc9bb3..ec20143 100644 --- a/tests/kafkatest/services/__init__.py +++ b/tests/kafkatest/services/__init__.py @@ -12,4 +12,3 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/services/kafka/config.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/services/kafka/config.py b/tests/kafkatest/services/kafka/config.py index 8ea1662..1b81b43 100644 --- a/tests/kafkatest/services/kafka/config.py +++ b/tests/kafkatest/services/kafka/config.py @@ -46,8 +46,3 @@ class KafkaConfig(dict): s += "%s=%s\n" % (k, str(self[k])) return s - - - - - http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/services/kafka/templates/kafka.properties ---------------------------------------------------------------------- diff --git a/tests/kafkatest/services/kafka/templates/kafka.properties b/tests/kafkatest/services/kafka/templates/kafka.properties index 4408144..9924aeb 100644 --- a/tests/kafkatest/services/kafka/templates/kafka.properties +++ b/tests/kafkatest/services/kafka/templates/kafka.properties @@ -12,9 +12,8 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults - +# see kafka.server.KafkaConfig for additional details and defaults advertised.host.name={{ node.account.hostname }} http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/services/templates/console_consumer.properties ---------------------------------------------------------------------- diff --git a/tests/kafkatest/services/templates/console_consumer.properties b/tests/kafkatest/services/templates/console_consumer.properties index c733f47..4bac01f 100644 --- a/tests/kafkatest/services/templates/console_consumer.properties +++ b/tests/kafkatest/services/templates/console_consumer.properties @@ -12,7 +12,6 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults group.id={{ group_id|default('test-consumer-group') }} http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/services/templates/zookeeper.properties ---------------------------------------------------------------------- diff --git a/tests/kafkatest/services/templates/zookeeper.properties b/tests/kafkatest/services/templates/zookeeper.properties index e66c53f..6048f31 100644 --- a/tests/kafkatest/services/templates/zookeeper.properties +++ b/tests/kafkatest/services/templates/zookeeper.properties @@ -12,7 +12,6 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults dataDir=/mnt/zookeeper clientPort=2181 @@ -22,4 +21,4 @@ syncLimit=2 quorumListenOnAllIPs=true {% for node in nodes %} server.{{ loop.index }}={{ node.account.hostname }}:2888:3888 -{% endfor %} \ No newline at end of file +{% endfor %} http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/tests/__init__.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/tests/__init__.py b/tests/kafkatest/tests/__init__.py index ebc9bb3..ec20143 100644 --- a/tests/kafkatest/tests/__init__.py +++ b/tests/kafkatest/tests/__init__.py @@ -12,4 +12,3 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/tests/client/__init__.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/tests/client/__init__.py b/tests/kafkatest/tests/client/__init__.py index ebc9bb3..ec20143 100644 --- a/tests/kafkatest/tests/client/__init__.py +++ b/tests/kafkatest/tests/client/__init__.py @@ -12,4 +12,3 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/tests/connect/__init__.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/tests/connect/__init__.py b/tests/kafkatest/tests/connect/__init__.py index ebc9bb3..ec20143 100644 --- a/tests/kafkatest/tests/connect/__init__.py +++ b/tests/kafkatest/tests/connect/__init__.py @@ -12,4 +12,3 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/tests/core/__init__.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/tests/core/__init__.py b/tests/kafkatest/tests/core/__init__.py index ebc9bb3..ec20143 100644 --- a/tests/kafkatest/tests/core/__init__.py +++ b/tests/kafkatest/tests/core/__init__.py @@ -12,4 +12,3 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/tests/tools/__init__.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/tests/tools/__init__.py b/tests/kafkatest/tests/tools/__init__.py index ebc9bb3..ec20143 100644 --- a/tests/kafkatest/tests/tools/__init__.py +++ b/tests/kafkatest/tests/tools/__init__.py @@ -12,4 +12,3 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/kafkatest/utils/__init__.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/utils/__init__.py b/tests/kafkatest/utils/__init__.py index ec224d8..6618016 100644 --- a/tests/kafkatest/utils/__init__.py +++ b/tests/kafkatest/utils/__init__.py @@ -12,6 +12,5 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults from util import kafkatest_version, is_version, is_int, is_int_with_prefix http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/tests/setup.py ---------------------------------------------------------------------- diff --git a/tests/setup.py b/tests/setup.py index dd750dc..848ca04 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -12,7 +12,6 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults import re import sys http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/vagrant/aws/aws-access-keys-commands ---------------------------------------------------------------------- diff --git a/vagrant/aws/aws-access-keys-commands b/vagrant/aws/aws-access-keys-commands index 9c923f8..2c69d29 100644 --- a/vagrant/aws/aws-access-keys-commands +++ b/vagrant/aws/aws-access-keys-commands @@ -12,7 +12,6 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults if [ -z "$AWS_IAM" ];then echo "Warning: AWS_IAM is not set" http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/vagrant/aws/aws-example-Vagrantfile.local ---------------------------------------------------------------------- diff --git a/vagrant/aws/aws-example-Vagrantfile.local b/vagrant/aws/aws-example-Vagrantfile.local index 853671e..ee9db9a 100644 --- a/vagrant/aws/aws-example-Vagrantfile.local +++ b/vagrant/aws/aws-example-Vagrantfile.local @@ -12,7 +12,6 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults # Use this template Vagrantfile.local for running system tests on aws # To use it, move it to the base kafka directory and rename http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/vagrant/aws/aws-init.sh ---------------------------------------------------------------------- diff --git a/vagrant/aws/aws-init.sh b/vagrant/aws/aws-init.sh index 60fa653..c0a6f67 100755 --- a/vagrant/aws/aws-init.sh +++ b/vagrant/aws/aws-init.sh @@ -13,7 +13,6 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults # This script can be used to set up a driver machine on aws from which you will run tests # or bring up your mini Kafka cluster. http://git-wip-us.apache.org/repos/asf/kafka/blob/801fee89/vagrant/system-test-Vagrantfile.local ---------------------------------------------------------------------- diff --git a/vagrant/system-test-Vagrantfile.local b/vagrant/system-test-Vagrantfile.local index 334ac85..898c02e 100644 --- a/vagrant/system-test-Vagrantfile.local +++ b/vagrant/system-test-Vagrantfile.local @@ -12,7 +12,6 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults # Use this example Vagrantfile.local for running system tests # To use it, move it to the base kafka directory and rename @@ -24,4 +23,4 @@ base_box = "kafkatest-worker" # System tests use hostnames for each worker that need to be defined in /etc/hosts on the host running ducktape -enable_dns = true \ No newline at end of file +enable_dns = true
