You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/17 09:27:03 UTC
[08/10] git commit: updated refs/heads/master to bf0c4f2
Merge release branch 4.6 to master
* 4.6:
more poms didn't get updated with script
implemented upgrade path from 4.6.0 to 4.6.1
checkstyle pom didn't get updated with script
debian: add 4.6.1-snapshot to changelog
Updating pom.xml version numbers for release 4.6.1-SNAPSHOT
Updating pom.xml version numbers for release 4.6.0
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/17219dfe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/17219dfe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/17219dfe
Branch: refs/heads/master
Commit: 17219dfe791320f331c325d54efd01af97ceeb1a
Parents: ea7c2d9 f6db0a2
Author: Rajani Karuturi <ra...@citrix.com>
Authored: Mon Nov 16 15:43:08 2015 +0530
Committer: Rajani Karuturi <ra...@citrix.com>
Committed: Mon Nov 16 15:43:08 2015 +0530
----------------------------------------------------------------------
build/replace.properties | 2 +-
.../com/cloud/upgrade/dao/Upgrade460to461.java | 67 ++++++++++++++++++++
setup/db/db/schema-460to461-cleanup.sql | 20 ++++++
setup/db/db/schema-460to461.sql | 20 ++++++
tools/marvin/marvin/deployAndRun.py | 2 +-
tools/marvin/setup.py | 2 +-
6 files changed, 110 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17219dfe/tools/marvin/marvin/deployAndRun.py
----------------------------------------------------------------------
diff --cc tools/marvin/marvin/deployAndRun.py
index b408208,00bfe99..131d7f3
--- a/tools/marvin/marvin/deployAndRun.py
+++ b/tools/marvin/marvin/deployAndRun.py
@@@ -163,7 -163,7 +163,7 @@@ class ShellColor(object)
END = '\033[0m'
ITALICS = '\x1B[3m'
- #VERSION = "4.5.1-SNAPSHOT"
-#VERSION = "4.5.1"
++#VERSION = "4.7.0-SNAPSHOT"
class MarvinCli(cmd.Cmd, object):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17219dfe/tools/marvin/setup.py
----------------------------------------------------------------------
diff --cc tools/marvin/setup.py
index 56ff80a,6455c22..9766f3e
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@@ -27,7 -27,7 +27,7 @@@ except ImportError
raise RuntimeError("python setuptools is required to build Marvin")
- VERSION = "4.6.0-SNAPSHOT"
-VERSION = "4.6.0"
++VERSION = "4.7.0-SNAPSHOT"
setup(name="Marvin",
version=VERSION,