You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bo...@apache.org on 2015/12/14 16:53:14 UTC
git commit: updated refs/heads/master to a00fef8
Repository: cloudstack
Updated Branches:
refs/heads/master 8d2e031a8 -> a00fef8c3
Revert "Merge pull request #1243 from SudharmaJain/cs-9166"
This reverts commit 8d2e031a89f5b7c55e1d139b0d8d57d6b9163aff, reversing
changes made to 1b3a792b1211a670234b8e6a505e18cafcabe38a.
No 2x LGTM where given to this PR.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a00fef8c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a00fef8c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a00fef8c
Branch: refs/heads/master
Commit: a00fef8c332ebaede32c46cbf3065f4acaa91f02
Parents: 8d2e031
Author: Boris Schrijver <bo...@pcextreme.nl>
Authored: Mon Dec 14 16:49:11 2015 +0100
Committer: Boris Schrijver <bo...@pcextreme.nl>
Committed: Mon Dec 14 16:49:11 2015 +0100
----------------------------------------------------------------------
.../xenserver/resource/CitrixHelperTest.java | 19 -------------------
1 file changed, 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a00fef8c/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java
index e1dadc2..b656ec3 100644
--- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java
+++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java
@@ -1,22 +1,3 @@
-//
-// 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.hypervisor.xenserver.resource;
import junit.framework.Assert;
Re: git commit: updated refs/heads/master to a00fef8
Posted by Daan Hoogland <da...@gmail.com>.
Boris don't revert blindly on having one tgm anymore. I will now contiunue
and commit the same code directly on master!
On Mon, Dec 14, 2015 at 4:53 PM, <bo...@apache.org> wrote:
> Repository: cloudstack
> Updated Branches:
> refs/heads/master 8d2e031a8 -> a00fef8c3
>
>
> Revert "Merge pull request #1243 from SudharmaJain/cs-9166"
>
> This reverts commit 8d2e031a89f5b7c55e1d139b0d8d57d6b9163aff, reversing
> changes made to 1b3a792b1211a670234b8e6a505e18cafcabe38a.
>
> No 2x LGTM where given to this PR.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a00fef8c
> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a00fef8c
> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a00fef8c
>
> Branch: refs/heads/master
> Commit: a00fef8c332ebaede32c46cbf3065f4acaa91f02
> Parents: 8d2e031
> Author: Boris Schrijver <bo...@pcextreme.nl>
> Authored: Mon Dec 14 16:49:11 2015 +0100
> Committer: Boris Schrijver <bo...@pcextreme.nl>
> Committed: Mon Dec 14 16:49:11 2015 +0100
>
> ----------------------------------------------------------------------
> .../xenserver/resource/CitrixHelperTest.java | 19 -------------------
> 1 file changed, 19 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a00fef8c/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java
> ----------------------------------------------------------------------
> diff --git
> a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java
> b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java
> index e1dadc2..b656ec3 100644
> ---
> a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java
> +++
> b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/CitrixHelperTest.java
> @@ -1,22 +1,3 @@
> -//
> -// 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.hypervisor.xenserver.resource;
>
> import junit.framework.Assert;
>
>
--
Daan