Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/dcdd25d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/dcdd25d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/dcdd25d7 Branch: refs/heads/master Commit: dcdd25d7970bf7ba9c272c177ff232ebb4993f1f Parents: 68454b2 838fb26 Author: Aaron McCurry <[email protected]> Authored: Mon Oct 27 21:59:21 2014 -0400 Committer: Aaron McCurry <[email protected]> Committed: Mon Oct 27 21:59:21 2014 -0400 ---------------------------------------------------------------------- LICENSE | 4 + .../blur/console/util/CachingBlurClient.java | 40 +- blur-console/src/main/webapp/Gruntfile.js | 1 + .../src/main/webapp/js/blurconsole.queries.js | 2 +- .../src/main/webapp/js/blurconsole.search.js | 96 +- .../src/main/webapp/js/blurconsole.shell.js | 2 + .../src/main/webapp/libs/moment/moment.js | 2861 ++++++++++++++++++ blur-console/src/main/webapp/public/index.html | 2 +- ...rconsole.500ad524370515c9a3aadcdb7e2f6d17.js | 28 + ...rconsole.598dd9e6ddb733121e7b9b14ad7c4272.js | 28 + ...rconsole.c993c0b1cda5fe574572a29c27f660c3.js | 27 - .../src/main/webapp/public/js/blurconsole.js | 9 +- ...sole.js.2c30ff82585b96f59a6624e640395ff3.map | 1 - ...sole.js.6783a7cbcbda8b7b5ff3483c841cd343.map | 1 + .../main/webapp/public/js/blurconsole.js.map | 2 +- .../main/webapp/public/views/search.tpl.html | 5 +- .../src/main/webapp/views/search.tpl.html | 5 +- 17 files changed, 3056 insertions(+), 58 deletions(-) ----------------------------------------------------------------------
