You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2014/11/13 12:49:30 UTC
[03/50] incubator-lens git commit: Merge branch 'develop' of
github.com:InMobi/grill into develop
Merge branch 'develop' of github.com:InMobi/grill into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/699d4c89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/699d4c89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/699d4c89
Branch: refs/heads/toapache
Commit: 699d4c8912ff8993831bc9822fa63f8a6302034c
Parents: cea15f8 76c828f
Author: Rajat Khandelwal <ra...@inmobi.com>
Authored: Thu Nov 6 13:07:56 2014 +0530
Committer: Rajat Khandelwal <ra...@inmobi.com>
Committed: Thu Nov 6 13:07:56 2014 +0530
----------------------------------------------------------------------
.../src/main/resources/dim3-storage-tables.xml | 2 +-
.../src/main/resources/dim4-storage-tables.xml | 2 +-
.../main/resources/local-cluster-storage.xml | 2 +-
lens-ml-lib/src/test/resources/lens-site.xml | 4 +-
.../server/api/events/LensEventService.java | 8 ---
.../apache/lens/server/EventServiceImpl.java | 54 +++-------------
.../apache/lens/server/query/LensServerDAO.java | 2 +-
.../server/query/QueryExecutionServiceImpl.java | 2 +-
.../lens/server/query/TestEventService.java | 66 ++++++++++++++++----
.../lens/server/user/TestUserConfigLoader.java | 16 +++--
.../org/apache/lens/storage/db/DBStorage.java | 14 ++---
11 files changed, 88 insertions(+), 84 deletions(-)
----------------------------------------------------------------------