[02/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

fixed hardcoded merge message location This would be empty if run from another directory, resulting in a merge message with only a 'signed-off by' line. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1e6df1b7 Tree:

[01/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Repository: cloudstack Updated Branches: refs/heads/deploy-from-snapshot 6c3c9ea91 -> 44ba14d17 fix bug where the countdown would be on multiple lines Example of problem: ATTENTION: Merging pull request #731 from remibergsma/centos7-kvm into 'master' branch in 5 seconds. CTRL+c to abort.. -n

[12/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/main/java/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java -- diff --git a/utils/src/main/java/org/apache/commons/httpclient/cont

[03/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Merge pull request #734 from remibergsma/git-pr-errormsg Git PR merge script improvementsProcessed feedback from @bhaisaab and (a colleague of) @karuturi - make the help message better (I also updated Confluence) - make sure we can use it on other repo's as well (Documentation and such) Tested

[08/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Fix unit-test library dependencies - XML formatting - Fix license header - Reorder hamcrest, junit, mockito and powermock dependencies * Since several libraries include a subset of hamcrest classes, hamcrest should be declared first in the pom, inorder for its classes to be loaded first

[14/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/main/java/com/cloud/utils/nio/NioClient.java -- diff --git a/utils/src/main/java/com/cloud/utils/nio/NioClient.java b/utils/src/main/java/com/cloud/utils/ni

[10/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/test/java/com/cloud/utils/testcase/NioTest.java -- diff --git a/utils/src/test/java/com/cloud/utils/testcase/NioTest.java b/utils/src/test/java/com/cloud/ut

[22/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/com/cloud/utils/nio/NioClient.java -- diff --git a/utils/src/com/cloud/utils/nio/NioClient.java b/utils/src/com/cloud/utils/nio/NioClient.java deleted file

[27/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/com/cloud/utils/UriUtils.java -- diff --git a/utils/src/com/cloud/utils/UriUtils.java b/utils/src/com/cloud/utils/UriUtils.java deleted file mode 100644 ind

[04/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Merge pull request #731 from remibergsma/centos7-kvm CLOUDSTACK-8443: Support CentOS 7 as KVM hypervisorThis adds support for CentOS 7 as a KVM hypervisor. As discussed in the Jira issue, the root cause of the issue was the `cloudstack-setup-agent` script that added this line to `/etc/libvirt/q

[06/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Create Nicira NVP devices and enable plugin at deploy Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/abb824e3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/abb824e3 Diff: http://git-wip-us.apache.org/

[17/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/main/java/com/cloud/utils/component/ComponentLifecycle.java -- diff --git a/utils/src/main/java/com/cloud/utils/component/ComponentLifecycle.java b/utils/s

[15/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/main/java/com/cloud/utils/net/NetUtils.java -- diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/

[29/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Refactor cloud-utils project into Maven default structure Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/83fd8f60 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/83fd8f60 Diff: http://git-wip-us.apache.

[13/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/main/java/com/cloud/utils/security/CertificateHelper.java -- diff --git a/utils/src/main/java/com/cloud/utils/security/CertificateHelper.java b/utils/src/m

[07/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Add Marvin test for Nicira NVP plugin Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/98dd7717 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/98dd7717 Diff: http://git-wip-us.apache.org/repos/asf/clouds

[11/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/test/java/com/cloud/utils/StringUtilsTest.java -- diff --git a/utils/src/test/java/com/cloud/utils/StringUtilsTest.java b/utils/src/test/java/com/cloud/util

[20/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/main/java/com/cloud/utils/HttpUtils.java -- diff --git a/utils/src/main/java/com/cloud/utils/HttpUtils.java b/utils/src/main/java/com/cloud/utils/HttpUtils.

[05/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Merge pull request #738 from michaelandersen/vpc_defaultroute_fix CLOUDSTACK-8685: Fix for missing defaultroute on VPC router https://issues.apache.org/jira/browse/CLOUDSTACK-8685 Refactored CsRoute and CsAddress to: - add methods to add and verify the defaultroute - renamed methods flush, add

[16/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/main/java/com/cloud/utils/exception/ExceptionUtil.java -- diff --git a/utils/src/main/java/com/cloud/utils/exception/ExceptionUtil.java b/utils/src/main/jav

[09/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/test/com/cloud/utils/crypto/EncryptionSecretKeyCheckerTest.java -- diff --git a/utils/test/com/cloud/utils/crypto/EncryptionSecretKeyCheckerTest.java b/utils/t

[23/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/com/cloud/utils/net/NetUtils.java -- diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java deleted file mod

[19/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/main/java/com/cloud/utils/StringUtils.java -- diff --git a/utils/src/main/java/com/cloud/utils/StringUtils.java b/utils/src/main/java/com/cloud/utils/String

[18/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java -- diff --git a/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java b/utils/src/main

[24/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/com/cloud/utils/exception/ExceptionUtil.java -- diff --git a/utils/src/com/cloud/utils/exception/ExceptionUtil.java b/utils/src/com/cloud/utils/exception/Ex

[21/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/com/cloud/utils/security/CertificateHelper.java -- diff --git a/utils/src/com/cloud/utils/security/CertificateHelper.java b/utils/src/com/cloud/utils/securi

[33/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/utils/CommandRetryUtility.java -- diff --git a/plugins/network-elements/nicira-nvp/src/main/java/c

[49/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Use NSX specific RestClient in API implementation (NiciraNvpApi) - Simplify public API to return Lists instead of NiciraNvpLists Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/09f71533 Tree: http://git-wip-us.apach

[50/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Merge pull request #737 from miguelaferreira/feature/mferreira/ncx-follow-redirects-gardened-rebase CLOUDSTACK-8758: Handle redirects in communication with NXS controller (a.k.a. Nicira NVP)When an NSX controller node is part of a cluster it will redirect API calls to the master controller. Bec

[42/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Code clean up in cloud-utils project - Code formatting - Remove unused methods Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5fc953ed Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5fc953ed Diff: htt

[28/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/com/cloud/utils/ProcessUtil.java -- diff --git a/utils/src/com/cloud/utils/ProcessUtil.java b/utils/src/com/cloud/utils/ProcessUtil.java deleted file mode 1

[41/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Refactor cloud-plugin-network-nvp project into Maven default structure Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93b0989d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93b0989d Diff: http://git-w

[30/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/test/com/cloud/network/resource/NiciraNvpResourceTest.java -- diff --git a/plugins/network-elements/nicira-nvp/test/com/cloud/netw

[40/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java -- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/comm

[39/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/AccessRule.java -- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/Acce

[32/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/resource/NiciraNvpRequestWrapperTest.java -- diff --git a/plugins/network-elements/nicira-nvp/src/

[37/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/wrapper/NiciraNvpUpdateLogicalSwitchPortCommandWrapper.java -- diff --git a/plugins/network-element

[48/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/09f71533/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraNvpApiTest.java -- diff --git a/plugins/network-elements/nicira-nvp/src/test/java/com

[31/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java -- diff --git a/plugins/network-elements/nicira-nvp/test/com/cloud/

[26/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java -- diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java b/utils/src/com/cloud/utils/cisco/n1

[36/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpDeviceVO.java -- diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud

[45/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Delegate HTTP protocol activity in RESTServiceConnector to RestClient - All HTTP protocol activities are now handled by RestClient - This service is now only responsible for creating requests, and dispatching them to the client - Provides a Simple API for creating, updating, retrieving and delet

[47/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Refactor NSX api implementation (NiciraNvpApi) - Make internal method private - Remove unused methods - Refactor type deserialization adapter classes out Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c6602ee1 Tree

[44/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Add basic RestClient implentation based on HTTP Components 4.5 - Upgrade version of HTTP Components to 4.5 - Add helper class to create Http clients - Add helper class to build http requests - Add enum with the different Http Methods - Add constants class for HTTP related values Project: http://

[43/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Code clean up in cloud-plugin-network-nvp project - Code formatting - Declare final where possible - Remove unused methods - Remove throws declarations where not needed - Remove generated comments (e.g. "TODO Auto-generated method stub") Project: http://git-wip-us.apache.org/repos/asf/cloudstack

[38/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/SecurityRule.java -- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/Se

[34/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/SingleDefaultRouteImplicitRoutingConfig.java -- diff --git a/plugins/network-elements/nicir

[46/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

Add NSX specific RestClient implementation - Add -noverify JVM arg to surefire plugin, to allow Powermockito to de-encapsulate private methods - Add dependency on cloud-utils test-jar to use custom HttpRequest matchers Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: h

[35/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/AclRule.java -- diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/ne

[25/50] [abbrv] git commit: updated refs/heads/deploy-from-snapshot to 44ba14d

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83fd8f60/utils/src/com/cloud/utils/component/ComponentLifecycle.java -- diff --git a/utils/src/com/cloud/utils/component/ComponentLifecycle.java b/utils/src/com/cloud/utils/co