Merging upstream version 1.9.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 22 insertions, 0 deletions

diff --git a/iredis/data/commands/expiretime.md b/iredis/data/commands/expiretime.md
new file mode 100644
index 0000000..1c4c815
--- /dev/null
+++ b/iredis/data/commands/expiretime.md
@@ -0,0 +1,22 @@
+Returns the absolute Unix timestamp (since January 1, 1970) in seconds at which
+the given key will expire.
+
+See also the `PEXPIRETIME` command which returns the same information with
+milliseconds resolution.
+
+@return
+
+@integer-reply: Expiration Unix timestamp in seconds, or a negative value in
+order to signal an error (see the description below).
+
+- The command returns `-1` if the key exists but has no associated expiration
+  time.
+- The command returns `-2` if the key does not exist.
+
+@examples
+
+```cli
+SET mykey "Hello"
+EXPIREAT mykey 33177117420
+EXPIRETIME mykey
+```