Merge pull request #1366 from mozilla-services/decode_message_docs

Corrected the code to work as originally documented
mozilla-services · Feb 25, 2015 · ef48a8c · ef48a8c
2 parents 9475afe + 25f1234
commit ef48a8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/cmake/externals.cmake b/cmake/externals.cmake
@@ -19,7 +19,7 @@ if(INCLUDE_SANDBOX)
     externalproject_add(
         ${SANDBOX_PACKAGE}
         GIT_REPOSITORY https://github.com/mozilla-services/lua_sandbox.git
-        GIT_TAG 272955d7258d4bb833352383f8871bd0bce9c381
+        GIT_TAG 5a594412c51d9c24b7e3c6cacd6f125fb51e343f
         CMAKE_ARGS ${SANDBOX_ARGS}
         INSTALL_DIR ${PROJECT_PATH}
     )

diff --git a/docs/source/sandbox/lua.rst b/docs/source/sandbox/lua.rst
@@ -232,13 +232,12 @@ Heka specific functions that are exposed to the Lua sandbox
         - heka_message (string) Lua variable containing a Heka protobuf encoded message
 
     *Return*
-        - message (table or nil) The array based version of the message structure with
+        - message (table) The array based version of the message structure with
           the value member always being an array (even if there is only a single
           item).  This format makes working with the output more consistent.
           The wide variation in the inject table format is to ease the
           construction of the message especially when using an LPeg grammar
           transformation.
-        - err (string) The error message if the decode fails (i.e., message is nil).
 
 .. _heka_message_table_structure: