Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack

LICENSE

@@ -2350,6 +2350,8 @@ Within the deps/awsapi-lib directory
 
 Within the patches/systemvm/debian/config/etc directory
     placed in the public domain
+        by Adiscon GmbH  http://www.adiscon.com/ 
+            rsyslog.conf
         by Simon Kelley   
             dnsmasq.conf
             vpcdnsmasq.conf

patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ

@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
 ip link|grep BROADCAST|grep -v eth0|grep -v eth1|cut -d ":" -f 2 > /tmp/iflist
 while read i
 do

patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ

@@ -1,3 +1,20 @@
+! Licensed to the Apache Software Foundation (ASF) under one
+! or more contributor license agreements.  See the NOTICE file
+! distributed with this work for additional information
+! regarding copyright ownership.  The ASF licenses this file
+! to you 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.
+
 global_defs {
    router_id [ROUTER_ID]
 }

tools/whisker/descriptor.xml

@@ -2409,6 +2409,10 @@ this distribution.
             id='libvirt.org'
             name='The libvirt project'
             url='http://libvirt.org/' />
+        <organisation
+            id='adiscon.com'
+            name='Adiscon GmbH'
+            url='http://www.adiscon.com/' />
     </organisations>
     <primary-license id='ApacheLicenseVersion2'>
         <copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice>
@@ -2444,6 +2448,9 @@ Copyright (c) 2012 The Apache Software Foundation
     </within>
     <within dir='patches/systemvm/debian/config/etc'>
         <public-domain>
+            <by-organisation id='adiscon.com'>
+                <resource name='rsyslog.conf' />
+            </by-organisation>
             <by-organisation id='person:simon.kelley'>
                 <resource name='vpcdnsmasq.conf' />
                 <resource name='dnsmasq.conf' />