You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2016/01/29 10:17:21 UTC
[1/2] git commit: updated refs/heads/4.6 to 7c446f0
Repository: cloudstack
Updated Branches:
refs/heads/4.6 a4ad71cc5 -> 7c446f038
Add missing license header to ActionEventUtilsTest.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5de8cb17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5de8cb17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5de8cb17
Branch: refs/heads/4.6
Commit: 5de8cb179218be97842993d38365c3902a160328
Parents: 451ae2b
Author: jeff <je...@greenqloud.com>
Authored: Thu Jan 28 14:23:10 2016 +0000
Committer: jeff <je...@greenqloud.com>
Committed: Thu Jan 28 14:23:10 2016 +0000
----------------------------------------------------------------------
.../test/com/cloud/event/ActionEventUtilsTest.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5de8cb17/server/test/com/cloud/event/ActionEventUtilsTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/event/ActionEventUtilsTest.java b/server/test/com/cloud/event/ActionEventUtilsTest.java
index a7fcf53..17d3909 100644
--- a/server/test/com/cloud/event/ActionEventUtilsTest.java
+++ b/server/test/com/cloud/event/ActionEventUtilsTest.java
@@ -1,3 +1,19 @@
+// 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 java.lang.reflect.Field;
[2/2] git commit: updated refs/heads/4.6 to 7c446f0
Posted by da...@apache.org.
Merge pull request #1382 from greenqloud/pr-fix-license-header
Add missing license header to ActionEventUtilsTest.The test class was merged without the license header. This commit fixes that problem.
Also note that the license header exists on the master branch only as a result of commit 8a5fc16. The commit seems to be on the master branch and the 4.7 branch only. So there may be some conflicts when forward merging.
* pr/1382:
Add missing license header to ActionEventUtilsTest.
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7c446f03
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c446f03
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c446f03
Branch: refs/heads/4.6
Commit: 7c446f038c9b26dac46b13e0362a76651e561e9d
Parents: a4ad71c 5de8cb1
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jan 29 10:16:24 2016 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jan 29 10:16:24 2016 +0100
----------------------------------------------------------------------
.../test/com/cloud/event/ActionEventUtilsTest.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------