Merge branch 'master' of gitlab.odin.cse.buffalo.edu:odin-lab/Website

This commit is contained in:
Oliver Kennedy 2017-07-13 00:15:44 -04:00
commit 473c0998e8
2 changed files with 13 additions and 12 deletions

View file

@ -176,18 +176,6 @@
]
},
"artifacts" : [
{
"name" : "DBToaster",
"class" : "software",
"description" : "A tool that dynamically compiles database engines optimized for any given query workload.",
"released" : "05/2012",
"metrics" : {
"sitevisits" : 4191,
"downloads" : 1032
},
"metricsasof" : "December 10, 2014",
"url" : "http://www.dbtoaster.org"
},
{
"name" : "Just-in-Time Data Structures",
"class" : "software",
@ -202,6 +190,18 @@
"description" : "A probabilistic overlay for database systems",
"url" : "http://mimirdb.info"
},
{
"name" : "DBToaster",
"class" : "software",
"description" : "A tool that dynamically compiles database engines optimized for any given query workload.",
"released" : "05/2012",
"metrics" : {
"sitevisits" : 4191,
"downloads" : 1032
},
"metricsasof" : "December 10, 2014",
"url" : "http://www.dbtoaster.org"
},
{
"name" : "PigOut",
"class" : "software",

View file

@ -1,6 +1,7 @@
---
title: Overview
---
<div class="logo_text" style="text-align: right; margin-top: 0px; margin-right: 35px; margin-bottom: 20px">
The ODIn Lab @
<img src="<%=asset_path("logos")%>/lab_logo_notext_black.png" width="110" height="110" style="vertical-align: bottom; margin-bottom:-10px"/>