You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by fm...@apache.org on 2018/07/03 08:46:45 UTC
[cloudstack] branch 4.11 updated: Fixes: #2725
This is an automated email from the ASF dual-hosted git repository.
fmaximus pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.11 by this push:
new 89c2721 Fixes: #2725
89c2721 is described below
commit 89c2721fbd9acbcd7ffdcf3acb57d2ce4bcc760e
Author: Frank Maximus <fr...@nuagenetworks.net>
AuthorDate: Fri Jun 29 14:55:34 2018 +0200
Fixes: #2725
---
debian/changelog | 414 +++++++++++++++++-----------------
services/console-proxy/plugin/pom.xml | 58 ++---
services/iam/plugin/pom.xml | 116 +++++-----
services/iam/server/pom.xml | 114 +++++-----
tools/marvin/setup.py | 136 +++++------
5 files changed, 422 insertions(+), 416 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 818a764..3033264 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,204 +1,210 @@
-4.11.2-SNAPSHOTcloudstack (4.11.2-SNAPSHOT) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Update the version to 4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- the Apache CloudStack project <de...@cloudstack.apache.org> Thu, 21 Jun 2018 15:52:43 +0100
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.11.2-SNAPSHOT-SNAPSHOT) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Update the version to 4.11.2-SNAPSHOT-SNAPSHOT
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- the Apache CloudStack project <de...@cloudstack.apache.org> Mon, 05 Feb 2018 11:10:37 +0100
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.11.0.0) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Update the version to 4.11.0.0
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- the Apache CloudStack project <de...@cloudstack.apache.org> Fri, 26 Jan 2018 13:13:37 +0100
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.11.0.0-SNAPSHOT) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Update the version to 4.11.0.0-SNAPSHOT
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- the Apache CloudStack project <de...@cloudstack.apache.org> Mon, 03 Jul 2017 10:06:42 +0530
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.11.0.0-SNAPSHOT-SNAPSHOT) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Update the version to 4.10.0.snapshot
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- the Apache CloudStack project <de...@cloudstack.apache.org> Mon, 08 Aug 2016 11:22:34 +0530
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.9.0) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT [ Remi Bergsma ]
-4.11.2-SNAPSHOT * Update the version to 4.9.0.snapshot
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- the Apache CloudStack project <de...@cloudstack.apache.org> Wed, 20 Jan 2016 23:43:35 +0100
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.8.0-SNAPSHOT) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT [ Remi Bergsma ]
-4.11.2-SNAPSHOT * Update the version to 4.8.0.snapshot
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- the Apache CloudStack project <de...@cloudstack.apache.org> Sun, 21 Dec 2015 22:11:55 +0100
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.7.0-SNAPSHOT) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT [ Remi Bergsma ]
-4.11.2-SNAPSHOT * Update the version to 4.7.0.snapshot
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- the Apache CloudStack project <de...@cloudstack.apache.org> Sun, 15 Nov 2015 21:28:33 +0100
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.6.0-SNAPSHOT) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT [ Hugo Trippaers ]
-4.11.2-SNAPSHOT * Update the version to 4.6.0.snapshot
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT [ Rafael da Fonseca ]
-4.11.2-SNAPSHOT * Switch to dpkg-source 3.0 (native) format
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- the Apache CloudStack project <de...@cloudstack.apache.org> Thu, 18 Jun 2015 11:17:09 +0200
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.5.0-snapshot) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Update the version to 4.5.0.snapshot
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Hugo Trippaers <hu...@apache.org> Thu, 21 Nov 2013 12:00:00 -0400
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.4.0-snapshot) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Update the version to 4.4.0.snapshot
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Hugo Trippaers <hu...@apache.org> Thu, 21 Nov 2013 12:00:00 -0400
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.3.0-snapshot) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Update the version to 4.3.0.snapshot
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Chip Childers <ch...@apache.org> Thu, 1 Aug 2013 12:00:00 -0400
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.2.0) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Update the version to 4.2.0 to be in sync with Maven (again)
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Wido den Hollander <wi...@widodh.nl> Tue, 14 May 2013 15:56:42 +0200
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.2.0-incubating-0.0.snapshot) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Update the version to 4.2.0 to be in sync with Maven
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Wido den Hollander <wi...@widodh.nl> Wed, 13 Mar 2013 19:15:00 +0100
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloudstack (4.1.0-incubating-0.0.snapshot) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Incorporate incubating into version, remove epoch
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Noa Resare <no...@spotify.com> Tue, 05 Feb 2013 18:05:28 +0000
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (1:4.0.0-1) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping the version to 4.0.0
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Chip Childers <ch...@apache.org> Fri, 5 Oct 2012 16:00:00 -0500
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (1:4.0.0-beta6) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping the version to 4.0 Beta 6
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Wido den Hollander <wi...@widodh.nl> Fri, 5 Oct 2012 11:41:17 +0200
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (1:4.0.0-beta1) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping the version to 4.0 Beta 1
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Wido den Hollander <wi...@widodh.nl> Wed, 26 Sep 2012 21:14:48 +0200
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (4.0.0-rc2) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping the version to 4.0 RC2
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Wido den Hollander <wi...@widodh.nl> Mon, 24 Sep 2012 11:30:29 +0200
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (4.0.0-rc1) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping the version to 4.0 RC1
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Wido den Hollander <wi...@widodh.nl> Fri, 17 Aug 2012 11:10:41 +0200
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (3.0.2) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping the package version to the latest release.
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Wido den Hollander <wi...@widodh.nl> Wed, 25 Jul 2012 14:53:31 +0200
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (2.2.2) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping version number for next CloudStack release
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Engineering <in...@cloud.com> Mon, 7 Mar 2011 11:19:34 -0700
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (2.1.97) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping version number for next CloudStack release
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Rudd-O <ma...@cloud.com> Sat, 31 Jul 2010 19:09:54 -0700
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (2.0.97) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping version number for next CloudStack release
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Rudd-O <ma...@cloud.com> Mon, 12 Jul 2010 14:01:41 -0700
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (2.0.2) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping version number for next CloudStack release
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Rudd-O <ma...@cloud.com> Fri, 2 Jul 2010 19:55:41 -0700
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (2.0.0) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping version number for next CloudStack release
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Rudd-O <ma...@cloud.com> Tue, 15 Jun 2010 12:10:05 -0700
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (1.9.14) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping version number for next CloudStack release
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Rudd-O <ma...@cloud.com> Tue, 11 May 2010 14:46:14 -0700
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (1.9.12) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping version number for CloudStack RC4 release
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Rudd-O <ma...@cloud.com> Mon, 3 May 2010 14:46:14 -0700
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (1.9.11) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping version number for CloudStack release
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Rudd-O <ma...@cloud.com> Fri, 30 Apr 2010 15:08:38 -0700
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (1.9.10) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping version number for FOSS release
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Rudd-O <ma...@vmops.com> Wed, 28 Apr 2010 22:09:48 -0700
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (1.9.9) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Bumping version number for new build prereleases
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Rudd-O <ma...@vmops.com> Mon, 12 Apr 2010 17:39:44 -0700
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (1.9.8) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Branching RC3
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Rudd-O <ma...@vmops.com> Mon, 05 Apr 2010 12:46:06 -0700
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTcloud (1.9.7) unstable; urgency=low
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT * Initial Release.
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT -- Rudd-O <ma...@vmops.com> Thu, 25 Mar 2010 15:12:06 -0700
+cloudstack (4.11.2-SNAPSHOT) unstable; urgency=low
+
+ * Update the version to 4.11.2-SNAPSHOT
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Thu, 26 Jun 2018 18:24:36 +0100
+
+cloudstack (4.11.1.0) unstable; urgency=low
+
+ * Update the version to 4.11.1.0
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Thu, 21 Jun 2018 15:52:43 +0100
+
+cloudstack (4.11.1.0-SNAPSHOT) unstable; urgency=low
+
+ * Update the version to 4.11.1.0-SNAPSHOT
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Mon, 05 Feb 2018 11:10:37 +0100
+
+cloudstack (4.11.0.0) unstable; urgency=low
+
+ * Update the version to 4.11.0.0
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Fri, 26 Jan 2018 13:13:37 +0100
+
+cloudstack (4.11.0.0-SNAPSHOT) unstable; urgency=low
+
+ * Update the version to 4.11.0.0-SNAPSHOT
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Mon, 03 Jul 2017 10:06:42 +0530
+
+cloudstack (4.11.0.0-SNAPSHOT-SNAPSHOT) unstable; urgency=low
+
+ * Update the version to 4.10.0.snapshot
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Mon, 08 Aug 2016 11:22:34 +0530
+
+cloudstack (4.9.0) unstable; urgency=low
+
+ [ Remi Bergsma ]
+ * Update the version to 4.9.0.snapshot
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Wed, 20 Jan 2016 23:43:35 +0100
+
+cloudstack (4.8.0-SNAPSHOT) unstable; urgency=low
+
+ [ Remi Bergsma ]
+ * Update the version to 4.8.0.snapshot
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Sun, 21 Dec 2015 22:11:55 +0100
+
+cloudstack (4.7.0-SNAPSHOT) unstable; urgency=low
+
+ [ Remi Bergsma ]
+ * Update the version to 4.7.0.snapshot
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Sun, 15 Nov 2015 21:28:33 +0100
+
+cloudstack (4.6.0-SNAPSHOT) unstable; urgency=low
+
+ [ Hugo Trippaers ]
+ * Update the version to 4.6.0.snapshot
+
+ [ Rafael da Fonseca ]
+ * Switch to dpkg-source 3.0 (native) format
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Thu, 18 Jun 2015 11:17:09 +0200
+
+cloudstack (4.5.0-snapshot) unstable; urgency=low
+
+ * Update the version to 4.5.0.snapshot
+
+ -- Hugo Trippaers <hu...@apache.org> Thu, 21 Nov 2013 12:00:00 -0400
+
+cloudstack (4.4.0-snapshot) unstable; urgency=low
+
+ * Update the version to 4.4.0.snapshot
+
+ -- Hugo Trippaers <hu...@apache.org> Thu, 21 Nov 2013 12:00:00 -0400
+
+cloudstack (4.3.0-snapshot) unstable; urgency=low
+
+ * Update the version to 4.3.0.snapshot
+
+ -- Chip Childers <ch...@apache.org> Thu, 1 Aug 2013 12:00:00 -0400
+
+cloudstack (4.2.0) unstable; urgency=low
+
+ * Update the version to 4.2.0 to be in sync with Maven (again)
+
+ -- Wido den Hollander <wi...@widodh.nl> Tue, 14 May 2013 15:56:42 +0200
+
+cloudstack (4.2.0-incubating-0.0.snapshot) unstable; urgency=low
+
+ * Update the version to 4.2.0 to be in sync with Maven
+
+ -- Wido den Hollander <wi...@widodh.nl> Wed, 13 Mar 2013 19:15:00 +0100
+
+cloudstack (4.1.0-incubating-0.0.snapshot) unstable; urgency=low
+
+ * Incorporate incubating into version, remove epoch
+
+ -- Noa Resare <no...@spotify.com> Tue, 05 Feb 2013 18:05:28 +0000
+
+cloud (1:4.0.0-1) unstable; urgency=low
+
+ * Bumping the version to 4.0.0
+
+ -- Chip Childers <ch...@apache.org> Fri, 5 Oct 2012 16:00:00 -0500
+
+cloud (1:4.0.0-beta6) unstable; urgency=low
+
+ * Bumping the version to 4.0 Beta 6
+
+ -- Wido den Hollander <wi...@widodh.nl> Fri, 5 Oct 2012 11:41:17 +0200
+
+cloud (1:4.0.0-beta1) unstable; urgency=low
+
+ * Bumping the version to 4.0 Beta 1
+
+ -- Wido den Hollander <wi...@widodh.nl> Wed, 26 Sep 2012 21:14:48 +0200
+
+cloud (4.0.0-rc2) unstable; urgency=low
+
+ * Bumping the version to 4.0 RC2
+
+ -- Wido den Hollander <wi...@widodh.nl> Mon, 24 Sep 2012 11:30:29 +0200
+
+cloud (4.0.0-rc1) unstable; urgency=low
+
+ * Bumping the version to 4.0 RC1
+
+ -- Wido den Hollander <wi...@widodh.nl> Fri, 17 Aug 2012 11:10:41 +0200
+
+cloud (3.0.2) unstable; urgency=low
+
+ * Bumping the package version to the latest release.
+
+ -- Wido den Hollander <wi...@widodh.nl> Wed, 25 Jul 2012 14:53:31 +0200
+
+cloud (2.2.2) unstable; urgency=low
+
+ * Bumping version number for next CloudStack release
+
+ -- Engineering <in...@cloud.com> Mon, 7 Mar 2011 11:19:34 -0700
+
+cloud (2.1.97) unstable; urgency=low
+
+ * Bumping version number for next CloudStack release
+
+ -- Rudd-O <ma...@cloud.com> Sat, 31 Jul 2010 19:09:54 -0700
+
+cloud (2.0.97) unstable; urgency=low
+
+ * Bumping version number for next CloudStack release
+
+ -- Rudd-O <ma...@cloud.com> Mon, 12 Jul 2010 14:01:41 -0700
+
+cloud (2.0.2) unstable; urgency=low
+
+ * Bumping version number for next CloudStack release
+
+ -- Rudd-O <ma...@cloud.com> Fri, 2 Jul 2010 19:55:41 -0700
+
+cloud (2.0.0) unstable; urgency=low
+
+ * Bumping version number for next CloudStack release
+
+ -- Rudd-O <ma...@cloud.com> Tue, 15 Jun 2010 12:10:05 -0700
+
+cloud (1.9.14) unstable; urgency=low
+
+ * Bumping version number for next CloudStack release
+
+ -- Rudd-O <ma...@cloud.com> Tue, 11 May 2010 14:46:14 -0700
+
+cloud (1.9.12) unstable; urgency=low
+
+ * Bumping version number for CloudStack RC4 release
+
+ -- Rudd-O <ma...@cloud.com> Mon, 3 May 2010 14:46:14 -0700
+
+cloud (1.9.11) unstable; urgency=low
+
+ * Bumping version number for CloudStack release
+
+ -- Rudd-O <ma...@cloud.com> Fri, 30 Apr 2010 15:08:38 -0700
+
+cloud (1.9.10) unstable; urgency=low
+
+ * Bumping version number for FOSS release
+
+ -- Rudd-O <ma...@vmops.com> Wed, 28 Apr 2010 22:09:48 -0700
+
+cloud (1.9.9) unstable; urgency=low
+
+ * Bumping version number for new build prereleases
+
+ -- Rudd-O <ma...@vmops.com> Mon, 12 Apr 2010 17:39:44 -0700
+
+cloud (1.9.8) unstable; urgency=low
+
+ * Branching RC3
+
+ -- Rudd-O <ma...@vmops.com> Mon, 05 Apr 2010 12:46:06 -0700
+
+cloud (1.9.7) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Rudd-O <ma...@vmops.com> Thu, 25 Mar 2010 15:12:06 -0700
diff --git a/services/console-proxy/plugin/pom.xml b/services/console-proxy/plugin/pom.xml
index 54c8883..60b1e51 100644
--- a/services/console-proxy/plugin/pom.xml
+++ b/services/console-proxy/plugin/pom.xml
@@ -1,29 +1,29 @@
-4.11.2-SNAPSHOT<!--
-4.11.2-SNAPSHOT Licensed to the Apache Software Foundation (ASF) under one
-4.11.2-SNAPSHOT or more contributor license agreements. See the NOTICE file
-4.11.2-SNAPSHOT distributed with this work for additional information
-4.11.2-SNAPSHOT regarding copyright ownership. The ASF licenses this file
-4.11.2-SNAPSHOT to you under the Apache License, Version 2.0 (the
-4.11.2-SNAPSHOT "License"); you may not use this file except in compliance
-4.11.2-SNAPSHOT with the License. You may obtain a copy of the License at
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT http://www.apache.org/licenses/LICENSE-2.0
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT Unless required by applicable law or agreed to in writing,
-4.11.2-SNAPSHOT software distributed under the License is distributed on an
-4.11.2-SNAPSHOT "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-4.11.2-SNAPSHOT KIND, either express or implied. See the License for the
-4.11.2-SNAPSHOT specific language governing permissions and limitations
-4.11.2-SNAPSHOT under the License.
-4.11.2-SNAPSHOT-->
-4.11.2-SNAPSHOT<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-4.11.2-SNAPSHOT <modelVersion>4.0.0</modelVersion>
-4.11.2-SNAPSHOT <artifactId>cloud-plugin-console-proxy</artifactId>
-4.11.2-SNAPSHOT <name>Apache CloudStack Console Proxy - Plugin</name>
-4.11.2-SNAPSHOT <parent>
-4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
-4.11.2-SNAPSHOT <artifactId>cloudstack-service-console-proxy</artifactId>
-4.11.2-SNAPSHOT <version>4.11.2-SNAPSHOT</version>
-4.11.2-SNAPSHOT <relativePath>../pom.xml</relativePath>
-4.11.2-SNAPSHOT </parent>
-4.11.2-SNAPSHOT</project>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cloud-plugin-console-proxy</artifactId>
+ <name>Apache CloudStack Console Proxy - Plugin</name>
+ <parent>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloudstack-service-console-proxy</artifactId>
+ <version>4.11.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+</project>
diff --git a/services/iam/plugin/pom.xml b/services/iam/plugin/pom.xml
index 8079ade..950fb8b 100644
--- a/services/iam/plugin/pom.xml
+++ b/services/iam/plugin/pom.xml
@@ -1,58 +1,58 @@
-4.11.2-SNAPSHOT<!--
-4.11.2-SNAPSHOT Licensed to the Apache Software Foundation (ASF) under one
-4.11.2-SNAPSHOT or more contributor license agreements. See the NOTICE file
-4.11.2-SNAPSHOT distributed with this work for additional information
-4.11.2-SNAPSHOT regarding copyright ownership. The ASF licenses this file
-4.11.2-SNAPSHOT to you under the Apache License, Version 2.0 (the
-4.11.2-SNAPSHOT "License"); you may not use this file except in compliance
-4.11.2-SNAPSHOT with the License. You may obtain a copy of the License at
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT http://www.apache.org/licenses/LICENSE-2.0
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT Unless required by applicable law or agreed to in writing,
-4.11.2-SNAPSHOT software distributed under the License is distributed on an
-4.11.2-SNAPSHOT "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-4.11.2-SNAPSHOT KIND, either express or implied. See the License for the
-4.11.2-SNAPSHOT specific language governing permissions and limitations
-4.11.2-SNAPSHOT under the License.
-4.11.2-SNAPSHOT-->
-4.11.2-SNAPSHOT<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-4.11.2-SNAPSHOT <modelVersion>4.0.0</modelVersion>
-4.11.2-SNAPSHOT <artifactId>cloud-plugin-iam</artifactId>
-4.11.2-SNAPSHOT <name>Apache CloudStack IAM - Plugin</name>
-4.11.2-SNAPSHOT <parent>
-4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
-4.11.2-SNAPSHOT <artifactId>cloudstack-service-iam</artifactId>
-4.11.2-SNAPSHOT <version>4.11.2-SNAPSHOT</version>
-4.11.2-SNAPSHOT <relativePath>../pom.xml</relativePath>
-4.11.2-SNAPSHOT </parent>
-4.11.2-SNAPSHOT <dependencies>
-4.11.2-SNAPSHOT <dependency>
-4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
-4.11.2-SNAPSHOT <artifactId>cloud-api</artifactId>
-4.11.2-SNAPSHOT <version>${project.version}</version>
-4.11.2-SNAPSHOT </dependency>
-4.11.2-SNAPSHOT <dependency>
-4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
-4.11.2-SNAPSHOT <artifactId>cloud-engine-schema</artifactId>
-4.11.2-SNAPSHOT <version>${project.version}</version>
-4.11.2-SNAPSHOT </dependency>
-4.11.2-SNAPSHOT <dependency>
-4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
-4.11.2-SNAPSHOT <artifactId>cloud-server</artifactId>
-4.11.2-SNAPSHOT <version>${project.version}</version>
-4.11.2-SNAPSHOT </dependency>
-4.11.2-SNAPSHOT <dependency>
-4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
-4.11.2-SNAPSHOT <artifactId>cloud-iam</artifactId>
-4.11.2-SNAPSHOT <version>${project.version}</version>
-4.11.2-SNAPSHOT </dependency>
-4.11.2-SNAPSHOT <dependency>
-4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
-4.11.2-SNAPSHOT <artifactId>cloud-api</artifactId>
-4.11.2-SNAPSHOT <version>${project.version}</version>
-4.11.2-SNAPSHOT <type>test-jar</type>
-4.11.2-SNAPSHOT <scope>test</scope>
-4.11.2-SNAPSHOT </dependency>
-4.11.2-SNAPSHOT </dependencies>
-4.11.2-SNAPSHOT</project>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cloud-plugin-iam</artifactId>
+ <name>Apache CloudStack IAM - Plugin</name>
+ <parent>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloudstack-service-iam</artifactId>
+ <version>4.11.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-engine-schema</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-iam</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/services/iam/server/pom.xml b/services/iam/server/pom.xml
index 6f950b4..08bd3d0 100644
--- a/services/iam/server/pom.xml
+++ b/services/iam/server/pom.xml
@@ -1,57 +1,57 @@
-4.11.2-SNAPSHOT<!--
-4.11.2-SNAPSHOT Licensed to the Apache Software Foundation (ASF) under one
-4.11.2-SNAPSHOT or more contributor license agreements. See the NOTICE file
-4.11.2-SNAPSHOT distributed with this work for additional information
-4.11.2-SNAPSHOT regarding copyright ownership. The ASF licenses this file
-4.11.2-SNAPSHOT to you under the Apache License, Version 2.0 (the
-4.11.2-SNAPSHOT "License"); you may not use this file except in compliance
-4.11.2-SNAPSHOT with the License. You may obtain a copy of the License at
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT http://www.apache.org/licenses/LICENSE-2.0
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT Unless required by applicable law or agreed to in writing,
-4.11.2-SNAPSHOT software distributed under the License is distributed on an
-4.11.2-SNAPSHOT "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-4.11.2-SNAPSHOT KIND, either express or implied. See the License for the
-4.11.2-SNAPSHOT specific language governing permissions and limitations
-4.11.2-SNAPSHOT under the License.
-4.11.2-SNAPSHOT-->
-4.11.2-SNAPSHOT<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-4.11.2-SNAPSHOT <modelVersion>4.0.0</modelVersion>
-4.11.2-SNAPSHOT <artifactId>cloud-iam</artifactId>
-4.11.2-SNAPSHOT <name>Apache CloudStack IAM - Server</name>
-4.11.2-SNAPSHOT <parent>
-4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
-4.11.2-SNAPSHOT <artifactId>cloudstack-service-iam</artifactId>
-4.11.2-SNAPSHOT <version>4.11.2-SNAPSHOT</version>
-4.11.2-SNAPSHOT <relativePath>../pom.xml</relativePath>
-4.11.2-SNAPSHOT </parent>
-4.11.2-SNAPSHOT <dependencies>
-4.11.2-SNAPSHOT <dependency>
-4.11.2-SNAPSHOT <groupId>commons-io</groupId>
-4.11.2-SNAPSHOT <artifactId>commons-io</artifactId>
-4.11.2-SNAPSHOT <version>${cs.commons-io.version}</version>
-4.11.2-SNAPSHOT </dependency>
-4.11.2-SNAPSHOT <dependency>
-4.11.2-SNAPSHOT <groupId>net.sf.ehcache</groupId>
-4.11.2-SNAPSHOT <artifactId>ehcache-core</artifactId>
-4.11.2-SNAPSHOT </dependency>
-4.11.2-SNAPSHOT <dependency>
-4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
-4.11.2-SNAPSHOT <artifactId>cloud-utils</artifactId>
-4.11.2-SNAPSHOT <version>${project.version}</version>
-4.11.2-SNAPSHOT </dependency>
-4.11.2-SNAPSHOT <dependency>
-4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
-4.11.2-SNAPSHOT <artifactId>cloud-api</artifactId>
-4.11.2-SNAPSHOT <version>${project.version}</version>
-4.11.2-SNAPSHOT </dependency>
-4.11.2-SNAPSHOT <dependency>
-4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
-4.11.2-SNAPSHOT <artifactId>cloud-api</artifactId>
-4.11.2-SNAPSHOT <version>${project.version}</version>
-4.11.2-SNAPSHOT <type>test-jar</type>
-4.11.2-SNAPSHOT <scope>test</scope>
-4.11.2-SNAPSHOT </dependency>
-4.11.2-SNAPSHOT </dependencies>
-4.11.2-SNAPSHOT</project>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cloud-iam</artifactId>
+ <name>Apache CloudStack IAM - Server</name>
+ <parent>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloudstack-service-iam</artifactId>
+ <version>4.11.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${cs.commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index b738414..27e0511 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -1,68 +1,68 @@
-4.11.2-SNAPSHOT#!/usr/bin/env python
-4.11.2-SNAPSHOT# Licensed to the Apache Software Foundation (ASF) under one
-4.11.2-SNAPSHOT# or more contributor license agreements. See the NOTICE file
-4.11.2-SNAPSHOT# distributed with this work for additional information
-4.11.2-SNAPSHOT# regarding copyright ownership. The ASF licenses this file
-4.11.2-SNAPSHOT# to you under the Apache License, Version 2.0 (the
-4.11.2-SNAPSHOT# "License"); you may not use this file except in compliance
-4.11.2-SNAPSHOT# with the License. You may obtain a copy of the License at
-4.11.2-SNAPSHOT#
-4.11.2-SNAPSHOT# http://www.apache.org/licenses/LICENSE-2.0
-4.11.2-SNAPSHOT#
-4.11.2-SNAPSHOT# Unless required by applicable law or agreed to in writing,
-4.11.2-SNAPSHOT# software distributed under the License is distributed on an
-4.11.2-SNAPSHOT# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-4.11.2-SNAPSHOT# KIND, either express or implied. See the License for the
-4.11.2-SNAPSHOT# specific language governing permissions and limitations
-4.11.2-SNAPSHOT# under the License.
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTtry:
-4.11.2-SNAPSHOT from setuptools import setup, find_packages
-4.11.2-SNAPSHOTexcept ImportError:
-4.11.2-SNAPSHOT try:
-4.11.2-SNAPSHOT from distribute_setup import use_setuptools
-4.11.2-SNAPSHOT use_setuptools()
-4.11.2-SNAPSHOT from setuptools import setup, find_packages
-4.11.2-SNAPSHOT except ImportError:
-4.11.2-SNAPSHOT raise RuntimeError("python setuptools is required to build Marvin")
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTVERSION = "4.11.2-SNAPSHOT"
-4.11.2-SNAPSHOT
-4.11.2-SNAPSHOTsetup(name="Marvin",
-4.11.2-SNAPSHOT version=VERSION,
-4.11.2-SNAPSHOT description="Marvin - Python client for Apache CloudStack",
-4.11.2-SNAPSHOT author="The Apache CloudStack Team",
-4.11.2-SNAPSHOT author_email="dev@cloudstack.apache.org",
-4.11.2-SNAPSHOT maintainer="The Apache CloudStack Team",
-4.11.2-SNAPSHOT maintainer_email="dev@cloudstack.apache.org",
-4.11.2-SNAPSHOT long_description="Marvin is the Apache CloudStack python "
-4.11.2-SNAPSHOT "client written around the unittest framework",
-4.11.2-SNAPSHOT platforms=("Any",),
-4.11.2-SNAPSHOT url="https://builds.apache.org/job/cloudstack-marvin/",
-4.11.2-SNAPSHOT packages=["marvin", "marvin.cloudstackAPI",
-4.11.2-SNAPSHOT "marvin.lib", "marvin.config", "marvin.sandbox",
-4.11.2-SNAPSHOT "marvin.sandbox.advanced", "marvin.sandbox.advancedsg",
-4.11.2-SNAPSHOT "marvin.sandbox.basic"],
-4.11.2-SNAPSHOT license="LICENSE.txt",
-4.11.2-SNAPSHOT install_requires=[
-4.11.2-SNAPSHOT "mysql-connector-python >= 1.1.6",
-4.11.2-SNAPSHOT "requests >= 2.2.1",
-4.11.2-SNAPSHOT "paramiko >= 1.13.0",
-4.11.2-SNAPSHOT "nose >= 1.3.3",
-4.11.2-SNAPSHOT "ddt >= 0.4.0",
-4.11.2-SNAPSHOT "pyvmomi >= 5.5.0",
-4.11.2-SNAPSHOT "netaddr >= 0.7.14",
-4.11.2-SNAPSHOT "dnspython",
-4.11.2-SNAPSHOT "ipmisim >= 0.7"
-4.11.2-SNAPSHOT ],
-4.11.2-SNAPSHOT extras_require={
-4.11.2-SNAPSHOT "nuagevsp": ["vspk", "PyYAML", "futures", "netaddr", "retries", "jpype1"]
-4.11.2-SNAPSHOT },
-4.11.2-SNAPSHOT py_modules=['marvin.marvinPlugin'],
-4.11.2-SNAPSHOT zip_safe=False,
-4.11.2-SNAPSHOT entry_points={
-4.11.2-SNAPSHOT 'nose.plugins': ['marvinPlugin = marvin.marvinPlugin:MarvinPlugin'],
-4.11.2-SNAPSHOT 'console_scripts': ['marvincli = marvin.deployAndRun:main']
-4.11.2-SNAPSHOT },
-4.11.2-SNAPSHOT )
+#!/usr/bin/env python
+# 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.
+
+try:
+ from setuptools import setup, find_packages
+except ImportError:
+ try:
+ from distribute_setup import use_setuptools
+ use_setuptools()
+ from setuptools import setup, find_packages
+ except ImportError:
+ raise RuntimeError("python setuptools is required to build Marvin")
+
+
+VERSION = "4.11.2-SNAPSHOT"
+
+setup(name="Marvin",
+ version=VERSION,
+ description="Marvin - Python client for Apache CloudStack",
+ author="The Apache CloudStack Team",
+ author_email="dev@cloudstack.apache.org",
+ maintainer="The Apache CloudStack Team",
+ maintainer_email="dev@cloudstack.apache.org",
+ long_description="Marvin is the Apache CloudStack python "
+ "client written around the unittest framework",
+ platforms=("Any",),
+ url="https://builds.apache.org/job/cloudstack-marvin/",
+ packages=["marvin", "marvin.cloudstackAPI",
+ "marvin.lib", "marvin.config", "marvin.sandbox",
+ "marvin.sandbox.advanced", "marvin.sandbox.advancedsg",
+ "marvin.sandbox.basic"],
+ license="LICENSE.txt",
+ install_requires=[
+ "mysql-connector-python >= 1.1.6",
+ "requests >= 2.2.1",
+ "paramiko >= 1.13.0",
+ "nose >= 1.3.3",
+ "ddt >= 0.4.0",
+ "pyvmomi >= 5.5.0",
+ "netaddr >= 0.7.14",
+ "dnspython",
+ "ipmisim >= 0.7"
+ ],
+ extras_require={
+ "nuagevsp": ["vspk", "PyYAML", "futures", "netaddr", "retries", "jpype1"]
+ },
+ py_modules=['marvin.marvinPlugin'],
+ zip_safe=False,
+ entry_points={
+ 'nose.plugins': ['marvinPlugin = marvin.marvinPlugin:MarvinPlugin'],
+ 'console_scripts': ['marvincli = marvin.deployAndRun:main']
+ },
+ )