You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2017/09/05 06:05:31 UTC
[17/50] cassandra git commit: Reformated git install formatting from,
'git:cassandra-2.2', to, 'github:apache/cassandra-2.2'.
Reformated git install formatting from, 'git:cassandra-2.2', to, 'github:apache/cassandra-2.2'.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c93bd487
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c93bd487
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c93bd487
Branch: refs/heads/master
Commit: c93bd48712f32aaff475bc3265968b36c6665229
Parents: ef84f76
Author: MichaelHamm <mi...@gmail.com>
Authored: Fri Jun 9 14:21:42 2017 -0700
Committer: Philip Thompson <pt...@gmail.com>
Committed: Mon Jun 12 13:02:54 2017 +0200
----------------------------------------------------------------------
mixed_version_test.py | 4 ++--
offline_tools_test.py | 14 +++++++-------
upgrade_crc_check_chance_test.py | 2 +-
upgrade_internal_auth_test.py | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c93bd487/mixed_version_test.py
----------------------------------------------------------------------
diff --git a/mixed_version_test.py b/mixed_version_test.py
index f60584a..9da28b9 100644
--- a/mixed_version_test.py
+++ b/mixed_version_test.py
@@ -21,9 +21,9 @@ class TestSchemaChanges(Tester):
node1, node2 = cluster.nodelist()
original_version = node1.get_cassandra_version()
if original_version.vstring.startswith('2.0'):
- upgraded_version = 'git:cassandra-2.1'
+ upgraded_version = 'github:apache/cassandra-2.1'
elif original_version.vstring.startswith('2.1'):
- upgraded_version = 'git:cassandra-2.2'
+ upgraded_version = 'github:apache/cassandra-2.2'
else:
self.skip("This test is only designed to work with 2.0 and 2.1 right now")
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c93bd487/offline_tools_test.py
----------------------------------------------------------------------
diff --git a/offline_tools_test.py b/offline_tools_test.py
index 3f9c2b7..c0a0010 100644
--- a/offline_tools_test.py
+++ b/offline_tools_test.py
@@ -329,19 +329,19 @@ class TestOfflineTools(Tester):
# CCM doesn't handle this upgrade correctly and results in an error when flushing 2.1:
# Error opening zip file or JAR manifest missing : /home/mshuler/git/cassandra/lib/jamm-0.2.5.jar
# The 2.1 installed jamm version is 0.3.0, but bin/cassandra.in.sh used by nodetool still has 0.2.5
- # (when this is fixed in CCM issue #463, install version='git:cassandra-2.0' as below)
+ # (when this is fixed in CCM issue #463, install version='github:apache/cassandra-2.0' as below)
self.skipTest('Skipping 2.1 test due to jamm.jar version upgrade problem in CCM node configuration.')
elif testversion < '3.0':
- debug('Test version: {} - installing git:cassandra-2.1'.format(testversion))
- cluster.set_install_dir(version='git:cassandra-2.1')
+ debug('Test version: {} - installing github:apache/cassandra-2.1'.format(testversion))
+ cluster.set_install_dir(version='github:apache/cassandra-2.1')
# As of 3.5, sstable format 'ma' from 3.0 is still the latest - install 2.2 to upgrade from
elif testversion < '4.0':
- debug('Test version: {} - installing git:cassandra-2.2'.format(testversion))
- cluster.set_install_dir(version='git:cassandra-2.2')
+ debug('Test version: {} - installing github:apache/cassandra-2.2'.format(testversion))
+ cluster.set_install_dir(version='github:apache/cassandra-2.2')
# From 4.0, one can only upgrade from 3.0
else:
- debug('Test version: {} - installing git:cassandra-3.0'.format(testversion))
- cluster.set_install_dir(version='git:cassandra-3.0')
+ debug('Test version: {} - installing github:apache/cassandra-3.0'.format(testversion))
+ cluster.set_install_dir(version='github:apache/cassandra-3.0')
# Start up last major version, write out an sstable to upgrade, and stop node
cluster.populate(1).start(wait_for_binary_proto=True)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c93bd487/upgrade_crc_check_chance_test.py
----------------------------------------------------------------------
diff --git a/upgrade_crc_check_chance_test.py b/upgrade_crc_check_chance_test.py
index 0367104..ec758c2 100644
--- a/upgrade_crc_check_chance_test.py
+++ b/upgrade_crc_check_chance_test.py
@@ -25,7 +25,7 @@ class TestCrcCheckChanceUpgrade(Tester):
cluster = self.cluster
# Forcing cluster version on purpose
- cluster.set_install_dir(version="git:cassandra-2.2")
+ cluster.set_install_dir(version="github:apache/cassandra-2.2")
cluster.populate(2).start()
node1, node2 = cluster.nodelist()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c93bd487/upgrade_internal_auth_test.py
----------------------------------------------------------------------
diff --git a/upgrade_internal_auth_test.py b/upgrade_internal_auth_test.py
index 2c5681d..62acac9 100644
--- a/upgrade_internal_auth_test.py
+++ b/upgrade_internal_auth_test.py
@@ -23,12 +23,12 @@ class TestAuthUpgrade(Tester):
)
def upgrade_to_22_test(self):
- self.do_upgrade_with_internal_auth("git:cassandra-2.2")
+ self.do_upgrade_with_internal_auth("github:apache/cassandra-2.2")
@since('3.0')
@skipIf(OFFHEAP_MEMTABLES, 'offheap_objects are not available in 3.0')
def upgrade_to_30_test(self):
- self.do_upgrade_with_internal_auth("git:cassandra-3.0")
+ self.do_upgrade_with_internal_auth("github:apache/cassandra-3.0")
@since('2.2', max_version='3.X')
def test_upgrade_legacy_table(self):
@@ -101,7 +101,7 @@ class TestAuthUpgrade(Tester):
cluster = self.cluster
# Forcing cluster version on purpose
- cluster.set_install_dir(version="git:cassandra-2.1")
+ cluster.set_install_dir(version="github:apache/cassandra-2.1")
cluster.populate(3).start()
node1, node2, node3 = cluster.nodelist()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org