Browse Source

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 <geoff@confluent.io>

Reviewers: Ismael Juma <ismael@juma.me.uk>

Closes #1659 from granders/minor-cleanup-init-files
pull/1665/head
Geoff Anderson 8 years ago committed by Ismael Juma
parent
commit
801fee89d8
  1. 1
      config/server.properties
  2. 1
      tests/kafkatest/__init__.py
  3. 1
      tests/kafkatest/benchmarks/core/__init__.py
  4. 1
      tests/kafkatest/benchmarks/streams/__init__.py
  5. 1
      tests/kafkatest/services/__init__.py
  6. 5
      tests/kafkatest/services/kafka/config.py
  7. 3
      tests/kafkatest/services/kafka/templates/kafka.properties
  8. 1
      tests/kafkatest/services/templates/console_consumer.properties
  9. 3
      tests/kafkatest/services/templates/zookeeper.properties
  10. 1
      tests/kafkatest/tests/__init__.py
  11. 1
      tests/kafkatest/tests/client/__init__.py
  12. 1
      tests/kafkatest/tests/connect/__init__.py
  13. 1
      tests/kafkatest/tests/core/__init__.py
  14. 1
      tests/kafkatest/tests/tools/__init__.py
  15. 1
      tests/kafkatest/utils/__init__.py
  16. 1
      tests/setup.py
  17. 1
      vagrant/aws/aws-access-keys-commands
  18. 1
      vagrant/aws/aws-example-Vagrantfile.local
  19. 1
      vagrant/aws/aws-init.sh
  20. 3
      vagrant/system-test-Vagrantfile.local

1
config/server.properties

@ -12,6 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults # see kafka.server.KafkaConfig for additional details and defaults
############################# Server Basics ############################# ############################# Server Basics #############################

1
tests/kafkatest/__init__.py

@ -12,7 +12,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 # This determines the version of kafkatest that can be published to PyPi and installed with pip
# #

1
tests/kafkatest/benchmarks/core/__init__.py

@ -12,4 +12,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults

1
tests/kafkatest/benchmarks/streams/__init__.py

@ -12,4 +12,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults

1
tests/kafkatest/services/__init__.py

@ -12,4 +12,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults

5
tests/kafkatest/services/kafka/config.py

@ -46,8 +46,3 @@ class KafkaConfig(dict):
s += "%s=%s\n" % (k, str(self[k])) s += "%s=%s\n" % (k, str(self[k]))
return s return s

3
tests/kafkatest/services/kafka/templates/kafka.properties

@ -12,9 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 }} advertised.host.name={{ node.account.hostname }}

1
tests/kafkatest/services/templates/console_consumer.properties

@ -12,7 +12,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults
group.id={{ group_id|default('test-consumer-group') }} group.id={{ group_id|default('test-consumer-group') }}

3
tests/kafkatest/services/templates/zookeeper.properties

@ -12,7 +12,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults
dataDir=/mnt/zookeeper dataDir=/mnt/zookeeper
clientPort=2181 clientPort=2181
@ -22,4 +21,4 @@ syncLimit=2
quorumListenOnAllIPs=true quorumListenOnAllIPs=true
{% for node in nodes %} {% for node in nodes %}
server.{{ loop.index }}={{ node.account.hostname }}:2888:3888 server.{{ loop.index }}={{ node.account.hostname }}:2888:3888
{% endfor %} {% endfor %}

1
tests/kafkatest/tests/__init__.py

@ -12,4 +12,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults

1
tests/kafkatest/tests/client/__init__.py

@ -12,4 +12,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults

1
tests/kafkatest/tests/connect/__init__.py

@ -12,4 +12,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults

1
tests/kafkatest/tests/core/__init__.py

@ -12,4 +12,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults

1
tests/kafkatest/tests/tools/__init__.py

@ -12,4 +12,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults

1
tests/kafkatest/utils/__init__.py

@ -12,6 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 from util import kafkatest_version, is_version, is_int, is_int_with_prefix

1
tests/setup.py

@ -12,7 +12,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults
import re import re
import sys import sys

1
vagrant/aws/aws-access-keys-commands

@ -12,7 +12,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults
if [ -z "$AWS_IAM" ];then if [ -z "$AWS_IAM" ];then
echo "Warning: AWS_IAM is not set" echo "Warning: AWS_IAM is not set"

1
vagrant/aws/aws-example-Vagrantfile.local

@ -12,7 +12,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults
# Use this template Vagrantfile.local for running system tests on aws # Use this template Vagrantfile.local for running system tests on aws
# To use it, move it to the base kafka directory and rename # To use it, move it to the base kafka directory and rename

1
vagrant/aws/aws-init.sh

@ -13,7 +13,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 # 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. # or bring up your mini Kafka cluster.

3
vagrant/system-test-Vagrantfile.local

@ -12,7 +12,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# see kafka.server.KafkaConfig for additional details and defaults
# Use this example Vagrantfile.local for running system tests # Use this example Vagrantfile.local for running system tests
# To use it, move it to the base kafka directory and rename # 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 # System tests use hostnames for each worker that need to be defined in /etc/hosts on the host running ducktape
enable_dns = true enable_dns = true

Loading…
Cancel
Save