You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by sj...@apache.org on 2018/06/25 19:38:33 UTC

[2/7] asterixdb-bad git commit: Merge branch 'master' into results

Merge branch 'master' into results


Project: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/commit/cd40f4bf
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/tree/cd40f4bf
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/diff/cd40f4bf

Branch: refs/heads/resultsNoReplicate
Commit: cd40f4bfcc25e033efda5ea115a522d5abd2d985
Parents: 5fb2faa 792ece0
Author: Steven Glenn Jacobs <sj...@ucr.edu>
Authored: Tue Jun 5 11:54:37 2018 -0700
Committer: Steven Glenn Jacobs <sj...@ucr.edu>
Committed: Tue Jun 5 11:54:37 2018 -0700

----------------------------------------------------------------------
 .../src/main/resources/lang-extension/lang.txt  |  1 +
 .../disasters_with_friends.4.pollquery.sqlpp    | 30 ++++++++++++++++++++
 .../disasters_with_friends.4.sleep.sqlpp        | 26 -----------------
 .../disasters_with_friends.5.query.sqlpp        | 28 ------------------
 4 files changed, 31 insertions(+), 54 deletions(-)
----------------------------------------------------------------------