Merge pull request #917 from ideawu/dev

merge Dev
ideawu · Apr 20, 2016 · da90606 · da90606
2 parents cb88e98 + 8d56bc3
commit da90606
Show file tree

Hide file tree

Showing 273 changed files with 41,342 additions and 31,056 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+* 1.9.3
+	* New features:
+		- Do not allow slave request binlogs with seq greater than max_seq(2016-03-18)
+		- CLI comands with nagios output format(2016-03-06)
+		- User can input binary data via ssdb-cli(2016-02-24)
+		- Add ip_filter relative commands(2016-02-17)
+	* Bug fixes:
+		- Fix ttl not be deleted when deleting the only one key with ttl in the db, issue#885(2016-03-02)
+		- Fix bug when connecting to multi masters, the slave saves only one master's status(2016-03-01)
 * 1.9.2
 	* New features:
 		- Binlog capacity can be set in config file(2016-01-14)

diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ SSDB is stable, production-ready and is widely used by many Internet companies i
 * Persistent queue service
 * **Replication(master-slave), load balance**
 * GUI administration tool([phpssdbadmin](https://github.com/ssdb/phpssdbadmin))
+* Built-in CLI nagios self-checks
 
 ## PHP client API example