docs: replace stand-alone with standalone

CHANGELOG.md

@@ -1332,7 +1332,11 @@ and support for ARM platform, and proxy rewrite plugin.
 
 ### Core
 
-- :sunrise: **[support stand-alone mode](https://github.com/apache/incubator-apisix/blob/master/docs/en/latest/stand-alone-cn.md)**: using yaml to update configurations of APISIX, more friendly to kubernetes. [#464](https://github.com/apache/incubator-apisix/pull/464)
+<<<<<<< HEAD
+- :sunrise: **[support standalone mode](https://github.com/apache/incubator-apisix/blob/master/docs/en/latest/standalone-cn.md)**: using yaml to update configurations of APISIX, more friendly to kubernetes. [#464](https://github.com/apache/incubator-apisix/pull/464)
+=======
+- :sunrise: **[support standalone mode](https://github.com/apache/incubator-apisix/blob/master/docs/en/latest/standalone-cn.md)**: using yaml to update configurations of APISIX, more friendly to kubernetes. [#464](https://github.com/apache/incubator-apisix/pull/464)
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
 - :sunrise: **[support stream proxy](https://github.com/apache/incubator-apisix/blob/master/docs/en/latest/stream-proxy.md)**. [#513](https://github.com/apache/incubator-apisix/pull/513)
 - :sunrise: support consumer bind plugins. [#544](https://github.com/apache/incubator-apisix/pull/544)
 - support domain name in upstream, not only IP. [#522](https://github.com/apache/incubator-apisix/pull/522)

README.md

@@ -130,7 +130,11 @@ A/B testing, canary release, blue-green deployment, limit rate, defense against
   - [Dashboard](https://github.com/apache/apisix-dashboard)
   - Version Control: Supports rollbacks of operations.
   - CLI: start\stop\reload APISIX through the command line.
-  - [Stand-Alone](docs/en/latest/deployment-modes.md#stand-alone): Supports to load route rules from local YAML file, it is more friendly such as under the kubernetes(k8s).
+<<<<<<< HEAD
+  - [standalone](docs/en/latest/deployment-modes.md#standalone): Supports to load route rules from local YAML file, it is more friendly such as under the kubernetes(k8s).
+=======
+  - [standalone](docs/en/latest/deployment-modes.md#standalone): Supports to load route rules from local YAML file, it is more friendly such as under the kubernetes(k8s).
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
   - [Global Rule](docs/en/latest/terminology/global-rule.md): Allows to run any plugin for all request, eg: limit rate, IP filter etc.
   - High performance: The single-core QPS reaches 18k with an average delay of fewer than 0.2 milliseconds.
   - [Fault Injection](docs/en/latest/plugins/fault-injection.md)

apisix/core/config_yaml.lua

@@ -15,7 +15,11 @@
 -- limitations under the License.
 --
 
---- Get configuration information in Stand-alone mode.
+<<<<<<< HEAD
+--- Get configuration information in standalone mode.
+=======
+--- Get configuration information in standalone mode.
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
 --
 -- @module core.config_yaml
 

apisix/core/pubsub.lua

@@ -185,10 +185,23 @@ function _M.wait(self)
         end
 
         -- recovery of stored pb_store
+<<<<<<< HEAD
+<<<<<<< HEAD
         local pb_old_state = pb.state(pb_state)
 
         local data, err = pb.decode("PubSubReq", raw_data)
         pb.state(pb_old_state)
+=======
+        pb.state(pb_state)
+
+        local data, err = pb.decode("PubSubReq", raw_data)
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
+=======
+        local pb_old_state = pb.state(pb_state)
+
+        local data, err = pb.decode("PubSubReq", raw_data)
+        pb.state(pb_old_state)
+>>>>>>> 7ec3c0f583510ebcdf9c414f83792e1ac247a5b9
         if not data then
             log.error("pubsub server receives undecodable data, err: ", err)
             send_error(ws, 0, "wrong command")

apisix/plugins/grpc-transcode/proto.lua

@@ -99,7 +99,15 @@ end
 
 local function compile_proto(content)
     -- clear pb state
+<<<<<<< HEAD
+<<<<<<< HEAD
     local old_pb_state = pb.state(nil)
+=======
+    pb.state(nil)
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
+=======
+    local old_pb_state = pb.state(nil)
+>>>>>>> 7ec3c0f583510ebcdf9c414f83792e1ac247a5b9
 
     local compiled, err = compile_proto_text(content)
     if not compiled then
@@ -110,7 +118,15 @@ local function compile_proto(content)
     end
 
     -- fetch pb state
+<<<<<<< HEAD
+<<<<<<< HEAD
+    compiled.pb_state = pb.state(old_pb_state)
+=======
+    compiled.pb_state = pb.state(nil)
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
+=======
     compiled.pb_state = pb.state(old_pb_state)
+>>>>>>> 7ec3c0f583510ebcdf9c414f83792e1ac247a5b9
     return compiled
 end
 

apisix/plugins/grpc-transcode/request.lua

@@ -36,12 +36,26 @@ return function (proto, service, method, pb_option, deadline, default_values)
 
     req_read_body()
 
+<<<<<<< HEAD
+<<<<<<< HEAD
     local pb_old_state = pb.state(proto.pb_state)
+=======
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
+=======
+    local pb_old_state = pb.state(proto.pb_state)
+>>>>>>> 7ec3c0f583510ebcdf9c414f83792e1ac247a5b9
     util.set_options(proto, pb_option)
 
     local map_message = util.map_message(m.input_type, default_values or {})
     local ok, encoded = pcall(pb.encode, m.input_type, map_message)
+<<<<<<< HEAD
+<<<<<<< HEAD
+    pb.state(pb_old_state)
+=======
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
+=======
     pb.state(pb_old_state)
+>>>>>>> 7ec3c0f583510ebcdf9c414f83792e1ac247a5b9
 
     if not ok or not encoded then
         return false, "failed to encode request data to protobuf", 400

apisix/plugins/grpc-transcode/response.lua

@@ -25,7 +25,15 @@ local ipairs = ipairs
 local pcall  = pcall
 
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 local function handle_error_response(status_detail_type, proto)
+=======
+local function handle_error_response(status_detail_type)
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
+=======
+local function handle_error_response(status_detail_type, proto)
+>>>>>>> 7ec3c0f583510ebcdf9c414f83792e1ac247a5b9
     local err_msg
 
     local grpc_status = ngx.header["grpc-status-details-bin"]
@@ -58,9 +66,19 @@ local function handle_error_response(status_detail_type, proto)
         if status_detail_type and details then
             local decoded_details = {}
             for _, detail in ipairs(details) do
+<<<<<<< HEAD
+<<<<<<< HEAD
+                local pb_old_state = pb.state(proto.pb_state)
+                local ok, err_or_value = pcall(pb.decode, status_detail_type, detail.value)
+                pb.state(pb_old_state)
+=======
+                local ok, err_or_value = pcall(pb.decode, status_detail_type, detail.value)
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
+=======
                 local pb_old_state = pb.state(proto.pb_state)
                 local ok, err_or_value = pcall(pb.decode, status_detail_type, detail.value)
                 pb.state(pb_old_state)
+>>>>>>> 7ec3c0f583510ebcdf9c414f83792e1ac247a5b9
                 if not ok then
                     err_msg = "failed to call pb.decode to decode details in "
                            .. "grpc-status-details-bin"
@@ -101,7 +119,15 @@ return function(ctx, proto, service, method, pb_option, show_status_in_body, sta
 
     -- handle error response after the last response chunk
     if ngx.status >= 300 and show_status_in_body then
+<<<<<<< HEAD
+<<<<<<< HEAD
+        return handle_error_response(status_detail_type, proto)
+=======
+        return handle_error_response(status_detail_type)
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
+=======
         return handle_error_response(status_detail_type, proto)
+>>>>>>> 7ec3c0f583510ebcdf9c414f83792e1ac247a5b9
     end
 
     -- when body has already been read by other plugin
@@ -120,12 +146,26 @@ return function(ctx, proto, service, method, pb_option, show_status_in_body, sta
         buffer = string.sub(buffer, 6)
     end
 
+<<<<<<< HEAD
+<<<<<<< HEAD
     local pb_old_state = pb.state(proto.pb_state)
+=======
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
+=======
+    local pb_old_state = pb.state(proto.pb_state)
+>>>>>>> 7ec3c0f583510ebcdf9c414f83792e1ac247a5b9
     util.set_options(proto, pb_option)
 
     local err_msg
     local decoded = pb.decode(m.output_type, buffer)
+<<<<<<< HEAD
+<<<<<<< HEAD
+    pb.state(pb_old_state)
+=======
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
+=======
     pb.state(pb_old_state)
+>>>>>>> 7ec3c0f583510ebcdf9c414f83792e1ac247a5b9
     if not decoded then
         err_msg = "failed to decode response data by protobuf"
         ngx.arg[1] = err_msg

apisix/plugins/grpc-transcode/util.lua

@@ -48,6 +48,14 @@ function _M.find_method(proto, service, method)
         return nil
     end
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+    -- restore pb state
+    pb.state(proto.pb_state)
+>>>>>>> adcf6951c7baedf949108bfd37f46d078afe1143
+=======
+>>>>>>> 7ec3c0f583510ebcdf9c414f83792e1ac247a5b9
     return res
 end