You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/07/09 16:07:56 UTC

git commit: Fixed properties file missed in #56

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 7f4a63053 -> 13f1fac60


Fixed properties file missed in #56


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/13f1fac6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/13f1fac6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/13f1fac6

Branch: refs/heads/master
Commit: 13f1fac6093a1d1e8e71a873a8b6318dde81ec36
Parents: 7f4a630
Author: Andrew Kennedy <gr...@apache.org>
Authored: Wed Jul 9 15:07:47 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Wed Jul 9 15:07:47 2014 +0100

----------------------------------------------------------------------
 .../entity/messaging/kafka/zookeeper.properties      | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13f1fac6/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/zookeeper.properties
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/zookeeper.properties b/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/zookeeper.properties
index b17d4c8..6e39224 100644
--- a/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/zookeeper.properties
+++ b/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/zookeeper.properties
@@ -1,3 +1,4 @@
+[#ftl]
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,20 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-[#ftl]
-# Copyright 2013 by Cloudsoft Corp.
-#
-# 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.
 
 ##
 # KafkaZookeeper configuration template for Brooklyn