Merge branch 'unstable' into keydbpro

Former-commit-id: b7a1e16c0f04e8aeb3764e3681fa14fc0f97f6a3

utils/create-cluster/create-cluster

@@ -38,7 +38,11 @@ then
         PORT=$((PORT+1))
         HOSTS="$HOSTS $CLUSTER_HOST:$PORT"
     done
-    $BIN_PATH/keydb-cli --cluster create $HOSTS --cluster-replicas $REPLICAS
+    OPT_ARG=""
+    if [ "$2" == "-f" ]; then
+        OPT_ARG="--cluster-yes"
+    fi
+    $BIN_PATH/keydb-cli --cluster create $HOSTS --cluster-replicas $REPLICAS $OPT_ARG
     exit 0
 fi
 
@@ -104,7 +108,7 @@ fi
 
 echo "Usage: $0 [start|create|stop|watch|tail|clean|call]"
 echo "start       -- Launch Redis Cluster instances."
-echo "create      -- Create a cluster using keydb-cli --cluster create."
+echo "create [-f] -- Create a cluster using keydb-cli --cluster create."
 echo "stop        -- Stop Redis Cluster instances."
 echo "watch       -- Show CLUSTER NODES output (first 30 lines) of first node."
 echo "tail <id>   -- Run tail -f of instance at base port + ID."

utils/generate-command-help.rb

@@ -54,7 +54,7 @@ def commands
   require "json"
   require "uri"
 
-  url = URI.parse "https://raw.githubusercontent.com/antirez/keydb-doc/master/commands.json"
+  url = URI.parse "https://raw.githubusercontent.com/redis/redis-doc/master/commands.json"
   client = Net::HTTP.new url.host, url.port
   client.use_ssl = true
   response = client.get url.path

utils/releasetools/01_create_tarball.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-if [ $# != "1" ]
-then
-    echo "Usage: ./mkrelease.sh <git-ref>"
-    exit 1
-fi
-
-TAG=$1
-TARNAME="keydb-${TAG}.tar"
-echo "Generating /tmp/${TARNAME}"
-cd ~/hack/redis
-git archive $TAG --prefix keydb-${TAG}/ > /tmp/$TARNAME || exit 1
-echo "Gizipping the archive"
-rm -f /tmp/$TARNAME.gz
-gzip -9 /tmp/$TARNAME

utils/releasetools/02_upload_tarball.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-echo "Uploading..."
-scp /tmp/keydb-${1}.tar.gz antirez@antirez.com:/var/virtual/download.redis.io/httpdocs/releases/
-echo "Updating web site... (press any key if it is a stable release, or Ctrl+C)"
-read x
-ssh antirez@antirez.com "cd /var/virtual/download.redis.io/httpdocs; ./update.sh ${1}"

utils/releasetools/03_test_release.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-if [ $# != "1" ]
-then
-    echo "Usage: ${0} <git-ref>"
-    exit 1
-fi
-
-TAG=$1
-TARNAME="keydb-${TAG}.tar.gz"
-DOWNLOADURL="http://download.redis.io/releases/${TARNAME}"
-
-ssh antirez@metal "export TERM=xterm;
-                   cd /tmp;
-                   rm -rf test_release_tmp_dir;
-                   cd test_release_tmp_dir;
-                   rm -f $TARNAME;
-                   rm -rf keydb-${TAG};
-                   wget $DOWNLOADURL;
-                   tar xvzf $TARNAME;
-                   cd keydb-${TAG};
-                   make;
-                   ./runtest;
-                   ./runtest-sentinel;
-                   if [ -x runtest-cluster ]; then
-                       ./runtest-cluster;
-                   fi"

utils/releasetools/04_release_hash.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-SHA=$(curl -s http://download.redis.io/releases/keydb-${1}.tar.gz | shasum -a 256 | cut -f 1 -d' ')
-ENTRY="hash keydb-${1}.tar.gz sha256 $SHA http://download.redis.io/releases/keydb-${1}.tar.gz"
-echo $ENTRY >> ~/hack/keydb-hashes/README
-vi ~/hack/keydb-hashes/README
-echo "Press any key to commit, Ctrl-C to abort)."
-read yes
-(cd ~/hack/keydb-hashes; git commit -a -m "${1} hash."; git push)

utils/releasetools/changelog.tcl

@@ -1,35 +0,0 @@
-#!/usr/bin/env tclsh
-
-if {[llength $::argv] != 2 && [llength $::argv] != 3} {
-    puts "Usage: $::argv0 <branch> <version> \[<num-commits>\]"
-    exit 1
-}
-
-set branch [lindex $::argv 0]
-set ver [lindex $::argv 1]
-if {[llength $::argv] == 3} {
-    set count [lindex ::$argv 2]
-} else {
-    set count 100
-}
-
-set template {
-================================================================================
-Redis %ver%     Released %date%
-================================================================================
-
-Upgrade urgency <URGENCY>: <DESCRIPTION>
-}
-
-set template [string trim $template]
-append template "\n\n"
-set date [clock format [clock seconds]]
-set template [string map [list %ver% $ver %date% $date] $template]
-
-append template [exec git log $branch~$count..$branch "--format=format:%an in commit %h:%n %s" --shortstat]
-
-#Older, more verbose version.
-#
-#append template [exec git log $branch~30..$branch "--format=format:+-------------------------------------------------------------------------------%n| %s%n| By %an, %ai%n+--------------------------------------------------------------------------------%nhttps://github.com/antirez/redis/commit/%H%n%n%b" --stat]
-
-puts $template

utils/systemd-redis_server.service

@@ -20,6 +20,8 @@ Description=Redis data structure server
 Documentation=https://redis.io/documentation
 #Before=your_application.service another_example_application.service
 #AssertPathExists=/var/lib/redis
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 ExecStart=/usr/local/bin/redis-server --supervised systemd --daemonize no