scripting.txt file removed, content merged into the TODO file

diff --git a/TODO b/TODO
index dd6ba28bd6f149b7644849833df8b6a02f759fb7..d45b35047becca1f9445bfb73692a67e72fdf582 100644 (file)
--- a/TODO
+++ b/TODO
@@ -28,6 +28,14 @@ CLUSTER
 * Allow redis-trib to create a cluster-wide snapshot (using SYNC).
 * Allow redis-trib to restore a cluster-wide snapshot (implement UPLOAD?).
 
+SCRIPTING
+=========
+
+* MULTI/EXEC/...: should we do more than simply ignoring it?
+* Prevent Lua from calling itself with redis("eval",...)
+* SCRIPT FLUSH or alike to start a fresh interpreter?
+* http://redis.io/topics/sponsors
+
 APPEND ONLY FILE
 ================
 

diff --git a/src/SCRIPTING.txt b/src/SCRIPTING.txt
deleted file mode 100644 (file)
index 31dd6a3..0000000
--- a/src/SCRIPTING.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Documentation:
-
-    http://antirez.com/post/scripting-branch-released.html
-
-TODO:
-
-    MULTI/EXEC/...: should we do more than simply ignoring it?
-
-    Prevent Lua from calling itself with redis("eval",...)
-
-    Implement log() function, and define REDIS_WARNING, REDIS_NOTICE, ...
-
-    SCRIPT FLUSH or alike to start a fresh interpreter.
-
-    Max exection time for scripts, even pretty high, but in order to
-    prevent that an instance gets completely freezed by error.
-    Hint: Use a debug hook for this (lua_sethook() with LUA_MASKCOUNT).
-
-Blog post TODO:
-
-    Explain that for now this is just an experiemnt and there is no way to
-    tell if this will ever enter Redis stable, but that since it is pretty
-    self contained it is trivial to rebase with the unstable branch.
-
-    Explain how replication / AOF mix with scripting and why it is this way,
-    and that scripts should be written to don't depend from timing or other
-    external events if you want to use AOF / replication.
-
-    Show how fast it is!
-
-    Mention that dynamically generated scripts are not a good idea.