release: prepare for 2.1.6

Signed-off-by: Shlomi Livne <shlomi@scylladb.com>
release: prepare for 2.1.5
2018-07-01 22:36:16 +03:00 · 2018-06-19 09:07:04 +03:00 · 2018-06-06 11:28:17 +03:00 · 2018-05-01 22:15:31 +03:00 · 2018-04-17 09:45:25 +03:00 · 2018-03-29 15:24:56 +03:00
4 changed files with 18 additions and 35 deletions
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 #!/bin/sh
-VERSION=666.development
+VERSION=2.1.6
 if test -f version
 then
--- a/dist/debian/build_deb.sh
+++ b/dist/debian/build_deb.sh
@ -48,7 +48,7 @@ if [ "$(arch)" != "x86_64" ]; then
 fi
 if [ -e debian ] || [ -e build/release ]; then
-    rm -rf debian build
+    sudo rm -rf debian build
    mkdir build
 fi
 if is_debian_variant; then
--- a/dist/redhat/mock/scylla-jmx-epel-7-x86_64.cfg
+++ b/dist/redhat/mock/scylla-jmx-epel-7-x86_64.cfg
@ -22,51 +22,32 @@ mdpolicy=group:primary
 best=1
 # repos
-[base]
+[scylla-centos-base]
 name=BaseOS
 mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
 failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-7
+gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7
 gpgcheck=1
-[updates]
+[scylla-centos-updates]
 name=updates
 enabled=1
 mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
 failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-7
+gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7
 gpgcheck=1
-[epel]
+[scylla-centos-extras]
 name=epel
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
 failovermethod=priority
 gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-7
 gpgcheck=1
 [extras]
 name=extras
 mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=extras
 failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-7
+gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7
 gpgcheck=1
-[testing]
+[scylla-epel]
-name=epel-testing
+name=epel
-enabled=0
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel7&arch=x86_64
 failovermethod=priority
-
+gpgkey=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
-
+gpgcheck=1
 [local]
 name=local
 baseurl=https://kojipkgs.fedoraproject.org/repos/epel7-build/latest/x86_64/
 cost=2000
 enabled=0
 [epel-debuginfo]
 name=epel-debug
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-7&arch=x86_64
 failovermethod=priority
 enabled=0
 """
--- a/src/main/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/main/java/org/apache/cassandra/gms/FailureDetector.java
@ -105,9 +105,11 @@ public class FailureDetector extends APIMBean implements FailureDetectorMBean {
            ep.setAliave(obj.getBoolean("is_alive"));
            ep.setUpdateTimestamp(obj.getJsonNumber("update_time").longValue());
            JsonArray states = obj.getJsonArray("application_state");
-            for (int j = 0; j < states.size(); j++) {
+            if (states != null) {
-                JsonObject state = states.getJsonObject(j);
+                for (int j = 0; j < states.size(); j++) {
-                ep.addApplicationState(state.getInt("application_state"), state.getString("value"));
+                    JsonObject state = states.getJsonObject(j);
                    ep.addApplicationState(state.getInt("application_state"), state.getString("value"));
                }
            }
            res.put(obj.getString("addrs"), ep);
        }
Author	SHA1	Message	Date
Shlomi Livne	315934ba22	release: prepare for 2.1.6 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2018-07-01 22:36:16 +03:00
Shlomi Livne	e6cb601c1d	release: prepare for 2.1.5 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2018-06-19 09:07:04 +03:00
Shlomi Livne	0ddcf21a4c	release: prepare for 2.1.4 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2018-06-06 11:28:17 +03:00
Shlomi Livne	29b3c6ee62	release: prepare for 2.1.3 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2018-05-01 22:15:31 +03:00
Pekka Enberg	114691ded6	release: prepare for 2.1.2	2018-04-17 09:45:25 +03:00
Amnon Heiman	30e3709669	FailureDetector: check that states is not null before use When a node is part of a cluster but is down (like in the situation where a cluster is taken down and up again but not all nodes are up). There is no application_state information for that node. This patch check that the information exists before using it to prevent null pointer exception. After this patch, a call to nodetool gossipinfo would return the available information without failing. See scylladb/scylla#3330 Signed-off-by: Amnon Heiman <amnon@scylladb.com> Message-Id: <20180329115345.29357-1-amnon@scylladb.com> (cherry picked from commit `4e4589ba6f`)	2018-03-29 15:24:56 +03:00
Shlomi Livne	930e719863	release: prepare for 2.1.1 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2018-03-25 10:09:53 +03:00
Shlomi Livne	02df8c16d7	release: prepare for 2.1.0 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2018-02-14 15:18:13 +02:00
Shlomi Livne	a74d82bd79	release: prepare for 2.1.rc3 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2018-02-06 13:54:46 +02:00
Shlomi Livne	270718d79f	release: prepare for 2.1.rc2 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2018-01-16 16:23:28 +02:00
Shlomi Livne	364303bcef	release: prepare for 2.1.rc1 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2018-01-03 10:50:49 +02:00
Takuya ASADA	04b5b25327	dist/redhat: avoid hardcoding GPG key file path on scylla-jmx-epel-7-x86_64.cfg Since we want to support cross building, we shouldn't hardcode GPG file path, even these files provided on recent version of mock. This fixes build error on some older build environment such as CentOS-7.2. See scylladb/scylla#3002 Signed-off-by: Takuya ASADA <syuu@scylladb.com> Message-Id: <1512668704-6775-1-git-send-email-syuu@scylladb.com> (cherry picked from commit `6ae1559bcd`)	2017-12-08 17:37:34 +02:00
Takuya ASADA	9d8dda35bf	dist/debian: requires root privilege to wipe build directory Since we run pbuilder as root, .deb packages owned by root user so we need to run 'rm -rf build' as root as well. Signed-off-by: Takuya ASADA <syuu@scylladb.com> Message-Id: <1512373941-7018-1-git-send-email-syuu@scylladb.com> (cherry picked from commit `0f38eb221e`)	2017-12-04 10:05:05 +02:00
Shlomi Livne	66d95f8500	release: prepare for 2.1.rc0 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2017-11-19 18:51:45 +02:00