Merge branch 'master' into regions

framework/events/src/org/apache/cloudstack/framework/events/EventSubscriber.java

@@ -1,21 +1,19 @@
-/*
+// Licensed to the Apache Software Foundation (ASF) under one
- * Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
- * or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
- * distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
- * regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
- * to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
- * "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
- * with the License.  You may obtain a copy of the License at
+//
- *
+//   http://www.apache.org/licenses/LICENSE-2.0
- *   http://www.apache.org/licenses/LICENSE2.0
+//
- *
+// Unless required by applicable law or agreed to in writing,
- * Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
- * software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
- * KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
- * specific language governing permissions and limitations
+// under the License.
- * under the License.
- */
 
 package org.apache.cloudstack.framework.events;
 

server/src/com/cloud/event/UsageEventUtils.java

@@ -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.
+
 package com.cloud.event;
 
 import com.cloud.dc.DataCenterVO;

server/src/com/cloud/network/NetworkStateListener.java

@@ -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.
+
 package com.cloud.network;
 
 import com.cloud.event.EventCategory;

server/src/com/cloud/storage/listener/SnapshotStateListener.java

@@ -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.
+
 package com.cloud.storage.listener;
 
 import com.cloud.event.EventCategory;

server/src/com/cloud/storage/listener/VolumeStateListener.java

@@ -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.
+
 package com.cloud.storage.listener;
 
 import com.cloud.event.EventCategory;