Merge commit '10233dcd' from 'stabilization-f69489' Change-Id: I246fbb4e2081e9d58c53bf560540ecd8b7864009
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/b9d55c40 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/b9d55c40 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/b9d55c40 Branch: refs/heads/master Commit: b9d55c40e12be6cb4164dd154efa919040c617c7 Parents: 2660c63 10233dc Author: Michael Blow <[email protected]> Authored: Mon Oct 29 18:16:16 2018 -0400 Committer: Michael Blow <[email protected]> Committed: Mon Oct 29 18:16:16 2018 -0400 ---------------------------------------------------------------------- .../src/main/markdown/sqlpp/3_query.md | 104 ++++++++++++++++++- .../markdown/sqlpp/appendix_3_resolution.md | 3 + .../hyracks/ipc/impl/IPCConnectionManager.java | 11 +- 3 files changed, 103 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
