dist: add posix_net_conf.sh on Ubuntu package

Fixes #881 Signed-off-by: Takuya ASADA <syuu@scylladb.com> Message-Id: <1455522990-32044-1-git-send-email-syuu@scylladb.com> (cherry picked from commit fb3f4cc148)
dist: switch AMI base image to 'CentOS7-Base2', uses CentOS official kernel
2016-02-15 17:03:10 +02:00 · 2016-02-15 15:59:04 +02:00 · 2016-02-14 14:39:31 +02:00 · 2016-02-11 17:55:20 +02:00
4 changed files with 10 additions and 9 deletions
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 #!/bin/sh

-VERSION=666.development
+VERSION=0.18

 if test -f version
 then
--- a/dist/ami/scylla.json
+++ b/dist/ami/scylla.json
@@ -8,7 +8,7 @@
      "security_group_id": "{{user `security_group_id`}}",
      "region": "{{user `region`}}",
      "associate_public_ip_address": "{{user `associate_public_ip_address`}}",
-      "source_ami": "ami-8ef1d6e4",
+      "source_ami": "ami-f3102499",
      "user_data_file": "user_data.txt",
      "instance_type": "{{user `instance_type`}}",
      "ssh_username": "centos",
--- a/dist/ubuntu/rules.in
+++ b/dist/ubuntu/rules.in
@@ -40,7 +40,8 @@ override_dh_auto_install:
 	cp -r $(CURDIR)/licenses $(DOC)

 	mkdir -p $(SCRIPTS) && \
-	cp $(CURDIR)/seastar/dpdk/tools/dpdk_nic_bind.py $(SCRIPTS)
+	cp $(CURDIR)/seastar/scripts/dpdk_nic_bind.py $(SCRIPTS)
+	cp $(CURDIR)/seastar/scripts/posix_net_conf.sh $(SCRIPTS)
 	cp $(CURDIR)/dist/common/scripts/* $(SCRIPTS)
 	cp $(CURDIR)/dist/ubuntu/scripts/* $(SCRIPTS)

--- a/locator/abstract_replication_strategy.cc
+++ b/locator/abstract_replication_strategy.cc
@@ -168,12 +168,12 @@ abstract_replication_strategy::get_address_ranges(token_metadata& tm) const {
        if (wrap) {
            auto split_ranges = r.unwrap();
            for (auto ep : eps) {
-                ret.emplace(ep, std::move(split_ranges.first));
-                ret.emplace(ep, std::move(split_ranges.second));
+                ret.emplace(ep, split_ranges.first);
+                ret.emplace(ep, split_ranges.second);
            }
        } else {
            for (auto ep : eps) {
-                ret.emplace(ep, std::move(r));
+                ret.emplace(ep, r);
            }
        }
    }
@@ -190,12 +190,12 @@ abstract_replication_strategy::get_range_addresses(token_metadata& tm) const {
        if (wrap) {
            auto split_ranges = r.unwrap();
            for (auto ep : eps) {
-                ret.emplace(std::move(split_ranges.first), ep);
-                ret.emplace(std::move(split_ranges.second), ep);
+                ret.emplace(split_ranges.first, ep);
+                ret.emplace(split_ranges.second, ep);
            }
        } else {
            for (auto ep : eps) {
-                ret.emplace(std::move(r), ep);
+                ret.emplace(r, ep);
            }
        }
    }
Author	SHA1	Message	Date
Takuya ASADA	b532919c55	dist: add posix_net_conf.sh on Ubuntu package Fixes #881 Signed-off-by: Takuya ASADA <syuu@scylladb.com> Message-Id: <1455522990-32044-1-git-send-email-syuu@scylladb.com> (cherry picked from commit `fb3f4cc148`)	2016-02-15 17:03:10 +02:00
Takuya ASADA	6ae6dcc2fc	dist: switch AMI base image to 'CentOS7-Base2', uses CentOS official kernel On previous CentOS base image, it accsidently uses non-standard kernel from elrepo. This replaces base image to new one, contains CentOS default kernel. Fixes #890 Signed-off-by: Takuya ASADA <syuu@scylladb.com> Message-Id: <1455398903-2865-1-git-send-email-syuu@scylladb.com> (cherry picked from commit `3697cee76d`)	2016-02-15 15:59:04 +02:00
Tomasz Grabiec	5716140a14	abstract_replication_strategy: Fix generation of token ranges We can't move-from in the loop because the subject will be empty in all but the first iteration. Fixes crash during node stratup: "Exiting on unhandled exception of type 'runtime_exception': runtime error: Invalid token. Should have size 8, has size 0" Fixes update_cluster_layout_tests.py:TestUpdateClusterLayout.simple_add_node_1_test (and probably others) Signed-off-by: Tomasz Grabiec <tgrabiec@scylladb.com> (cherry picked from commit `efdbc3d6d7`)	2016-02-14 14:39:31 +02:00
Avi Kivity	91cb9bae2e	release: prepare for 0.18	2016-02-11 17:55:20 +02:00