You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/11/19 01:03:04 UTC
[2/4] git commit: cli: rename version to common
cli: rename version to common
The idea is to refactor and put common code in common module
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7f08c9db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7f08c9db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7f08c9db
Branch: refs/heads/master
Commit: 7f08c9db57cdc5ac528e0e60f739f426ee6943e4
Parents: 88180fc
Author: Rohit Yadav <bh...@apache.org>
Authored: Mon Nov 19 05:19:09 2012 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Mon Nov 19 05:28:23 2012 +0530
----------------------------------------------------------------------
tools/cli/cloudmonkey/__init__.py | 2 +-
tools/cli/cloudmonkey/common.py | 21 +++++++++++++++++++++
tools/cli/cloudmonkey/version.py | 22 ----------------------
3 files changed, 22 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7f08c9db/tools/cli/cloudmonkey/__init__.py
----------------------------------------------------------------------
diff --git a/tools/cli/cloudmonkey/__init__.py b/tools/cli/cloudmonkey/__init__.py
index 45632db..9674777 100644
--- a/tools/cli/cloudmonkey/__init__.py
+++ b/tools/cli/cloudmonkey/__init__.py
@@ -16,6 +16,6 @@
# under the License.
try:
- from version import __version__
+ from common import __version__
except ImportError, e:
print e
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7f08c9db/tools/cli/cloudmonkey/common.py
----------------------------------------------------------------------
diff --git a/tools/cli/cloudmonkey/common.py b/tools/cli/cloudmonkey/common.py
new file mode 100644
index 0000000..05dae10
--- /dev/null
+++ b/tools/cli/cloudmonkey/common.py
@@ -0,0 +1,21 @@
+# 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.
+
+# Use following rules for versioning:
+# <cli major version>.<cloudstack minor version>.<cloudstack major version>
+# Example: For CloudStack 4.1.x, CLI version should be 0.1.4
+__version__ = "0.0.4"
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7f08c9db/tools/cli/cloudmonkey/version.py
----------------------------------------------------------------------
diff --git a/tools/cli/cloudmonkey/version.py b/tools/cli/cloudmonkey/version.py
deleted file mode 100644
index 8d891b2..0000000
--- a/tools/cli/cloudmonkey/version.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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.
-
-# Use following rules for versioning:
-# <cli major version>.<cloudstack minor version>.<cloudstack major version>
-# Example: For CloudStack 4.1.x, CLI version should be 0.1.4
-__version__ = "0.0.4"
-