Merge branch 'develop' into feature-1.6

v4
Vinllen Chen 5 years ago committed by GitHub
commit 4f0548d0b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      README.md
  2. 4
      src/redis-shake/main/main.go

@ -73,7 +73,7 @@ User can use `-version` to print the version.
# Usage # Usage
--- ---
You can directly download the binary in the [release package](https://github.com/alibaba/RedisShake/releases), and use `start.sh` script to start it directly: `./start.sh redis-shake.conf sync`.<br> You can **directly download** the binary in the [release package](https://github.com/alibaba/RedisShake/releases), and use `start.sh` script to start it directly: `./start.sh redis-shake.conf sync`.<br>
You can also build redis-shake yourself according to the following steps, the `go` and `govendor` must be installed before compile: You can also build redis-shake yourself according to the following steps, the `go` and `govendor` must be installed before compile:
* git clone https://github.com/alibaba/RedisShake.git * git clone https://github.com/alibaba/RedisShake.git
* cd RedisShake * cd RedisShake

@ -512,6 +512,10 @@ func sanitizeOptions(tp string) error {
return fmt.Errorf("source rdb[%v] checksum should be open[config set rdbchecksum yes]", address) return fmt.Errorf("source rdb[%v] checksum should be open[config set rdbchecksum yes]", address)
} }
} }
//if len(conf.Options.SourceAddressList) == 1 {
// return fmt.Errorf("source address length should == 1 when type is 'rump'")
//}
} }
return nil return nil

Loading…
Cancel
Save