http://git-wip-us.apache.org/repos/asf/oodt/blob/268fe571/2016/06/26/oodt-10-released.html ---------------------------------------------------------------------- diff --cc 2016/06/26/oodt-10-released.html index 184bcb7,21b7feb..76ccaf3 --- a/2016/06/26/oodt-10-released.html +++ b/2016/06/26/oodt-10-released.html @@@ -137,7 -137,7 +137,11 @@@ have planned for 2.0!</p </li> </ul> <hr class="small"> ++<<<<<<< HEAD + <p class="text-muted">Copyright © The Apache Foundation 2018</p> ++======= + <p class="text-muted">Copyright © The Apache Foundation 2017</p> ++>>>>>>> 8b200c2ed3d2a31133856e923ba1ea67636619da </div> </div> </div>
http://git-wip-us.apache.org/repos/asf/oodt/blob/268fe571/2017/07/27/oodt-110-released.html ---------------------------------------------------------------------- diff --cc 2017/07/27/oodt-110-released.html index 5fd77f3,d9e16d2..766eb6d --- a/2017/07/27/oodt-110-released.html +++ b/2017/07/27/oodt-110-released.html @@@ -142,7 -142,7 +142,11 @@@ https://oodt.apache.org/.</p </li> </ul> <hr class="small"> ++<<<<<<< HEAD + <p class="text-muted">Copyright © The Apache Foundation 2018</p> ++======= + <p class="text-muted">Copyright © The Apache Foundation 2017</p> ++>>>>>>> 8b200c2ed3d2a31133856e923ba1ea67636619da </div> </div> </div> http://git-wip-us.apache.org/repos/asf/oodt/blob/268fe571/2017/08/28/oodt-112-released.html ---------------------------------------------------------------------- diff --cc 2017/08/28/oodt-112-released.html index 70562b7,78a0db6..acc9fa8 --- a/2017/08/28/oodt-112-released.html +++ b/2017/08/28/oodt-112-released.html @@@ -133,7 -133,7 +133,11 @@@ https://oodt.apache.org/.</p </li> </ul> <hr class="small"> ++<<<<<<< HEAD + <p class="text-muted">Copyright © The Apache Foundation 2018</p> ++======= + <p class="text-muted">Copyright © The Apache Foundation 2017</p> ++>>>>>>> 8b200c2ed3d2a31133856e923ba1ea67636619da </div> </div> </div> http://git-wip-us.apache.org/repos/asf/oodt/blob/268fe571/2018/02/04/oodt-121-released.html ---------------------------------------------------------------------- diff --cc 2018/02/04/oodt-121-released.html index 0000000,0000000..24f48a9 new file mode 100644 --- /dev/null +++ b/2018/02/04/oodt-121-released.html @@@ -1,0 -1,0 +1,155 @@@ ++<!DOCTYPE html> ++<html lang="en"> ++ ++<head> ++ ++ <meta charset="utf-8"> ++ <meta http-equiv="X-UA-Compatible" content="IE=edge"> ++ <meta name="viewport" content="width=device-width, initial-scale=1"> ++ <meta name="description" content="Apache OODT 1.2.1 released - Solr FM dumper fixes."> ++ ++ <meta name="author" content="Apache OODT"> ++ ++ <title>Apache OODT - Distributed Data Management</title> ++ ++ <!-- Bootstrap Core CSS --> ++ <link href="/css/bootstrap.min.css" rel="stylesheet"> ++ ++ <!-- Custom CSS --> ++ <link href="/css/stylish-portfolio.css" rel="stylesheet"> ++ ++ <!-- Custom Fonts --> ++ <link href="/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"> ++ <link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,300italic,400italic,700italic"; rel="stylesheet" type="text/css"> ++ ++ <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> ++ <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> ++ <!--[if lt IE 9]> ++ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js";></script> ++ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js";></script> ++ <![endif]--> ++ ++</head> ++ ++ ++<body> ++<nav class="navbar navbar-default"> ++ <div class="container-fluid"> ++ <div class="navbar-header"> ++ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> ++ <span class="sr-only">Toggle navigation</span> ++ <span class="icon-bar"></span> ++ <span class="icon-bar"></span> ++ <span class="icon-bar"></span> ++ </button> ++ <a class="navbar-brand" href="#"><img src="/img/oodt_asf_logo_sm.png"/></a> ++ </div> ++ ++ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> ++ ++ <ul class="nav navbar-nav"> ++ <!--<a id="menu-close" href="#" class="btn btn-light btn-lg pull-right toggle"><i class="fa fa-times"></i></a>--> ++ ++ <li> ++ <a href="/">Home</a> ++ </li> ++ <li> ++ <a href="/blog">News</a> ++ <li> ++ <a href="/site_docs/oodt/index.html">Components</a> ++ </li> ++ <li> ++ <a href="/documentation.html">Documentation</a> ++ </li> ++ <li> ++ <a href="/community.html" >Community</a> ++ </li> ++ <li> ++ <a href="/download.html" >Download</a> ++ </li> ++ ++ </ul> ++ </div> ++</div> ++</nav> ++ ++<div class="jumbotron oodt-lightbg"> ++ <div class="container"> ++ <h1 class="post-title">Apache OODT 1.2.1 released</h1> ++ <p class="post-date">February 04, 2018</p> ++ ++ </div> ++ ++</div> ++ ++<div class="container"> ++ ++ <div class="row"> ++ <div class="col-md-offset-2 col-md-8"> ++ <article class="post-content"> ++ <p>OODT 1.2.1</p> ++ ++<p>The OODT 1.2.1 release is now available.</p> ++ ++<p>This release fixed a bug that made the SolrIndexer unusable with ++the FM catalog, and as such broke downstream Apache OODT applications ++including Apache DRAT.</p> ++ ++<p>More details regarding build and deployment can be found over on ++https://oodt.apache.org/.</p> ++ ++<p>You can read the release announcement <a href="https://s.apache.org/YFJG";>here</a>.</p> ++ ++ </article> ++ </div> ++ </div> ++</div> ++ ++ ++<footer class="sitefooter"> ++ <div class="container"> ++ <div class="row"> ++ <div class="col-lg-10 col-lg-offset-1 text-center"> ++ <a href="http://www.apache.org/events/current-event.html";> ++ <img src="http://www.apache.org/events/current-event-234x60.png"/> ++ </a> ++ <h4><strong>Apache OODT</strong> ++ </h4> ++ <p> ++ ++ </p> ++ <ul class="list-unstyled"> ++ <li><i class="fa fa-envelope-o fa-fw"></i> <a href="mailto:[email protected]";>[email protected]</a> ++ </li> ++ </ul> ++ <br> ++ <ul class="list-inline"> ++<!-- <li> ++ <a href="https://facebook.com/";><i class="fa fa-facebook fa-fw fa-3x"></i></a> ++ </li>--> ++ <li> ++ <a href="https://twitter.com/apache_oodt";><i class="fa fa-twitter fa-fw fa-3x"></i></a> ++ </li> ++ <li> ++ <a href="https://github.com/apache/oodt";><i class="fa fa-github fa-fw fa-3x"></i></a> ++ </li> ++ </ul> ++ <hr class="small"> ++ <p class="text-muted">Copyright © The Apache Foundation 2018</p> ++ </div> ++ </div> ++ </div> ++</footer> ++ ++<!-- jQuery --> ++<script src="/js/jquery.js"></script> ++ ++<!-- Bootstrap Core JavaScript --> ++<script src="/js/bootstrap.min.js"></script> ++ ++<!-- Custom Theme JavaScript --> ++<script src="/js/custom.js"></script> ++ ++ ++</body> ++</html> http://git-wip-us.apache.org/repos/asf/oodt/blob/268fe571/blog.html ---------------------------------------------------------------------- diff --cc blog.html index a474dc3,d95bfe2..c69b935 --- a/blog.html +++ b/blog.html @@@ -89,15 -89,6 +89,14 @@@ <div class="col-md-offset-3 col-md-6"> <div class="list-group"> - + <a class="list-group-item" href="/2018/02/04/oodt-121-released.html"> + <h4 class="list-group-item-heading">Apache OODT 1.2.1 released</h4> + <p class="list-group-item-text"><p>OODT 1.2.1</p> + +</p> + </a> + + <a class="list-group-item" href="/2017/08/28/oodt-112-released.html"> <h4 class="list-group-item-heading">Apache OODT 1.2 released</h4> http://git-wip-us.apache.org/repos/asf/oodt/blob/268fe571/download.html ---------------------------------------------------------------------- diff --cc download.html index d10c0cf,fe2bd92..83d3fdc --- a/download.html +++ b/download.html @@@ -92,8 -92,8 +92,8 @@@ <p>You require <a href="http://maven.apache.org/";>Apache Maven</a> to build the OODT source code. Maven can either be downloaded and installed manually or alternatively via command line via your operating system package manager.</p> <h1>Official Release</h1> - <p>FEB-2018: The Latest Apache⢠OODT version 1.2.1 is now released and available for download.</p> - <p>AUG-2017: The Latest Apache⢠OODT version 1.2 is now released and available for download.</p> ++ <p>FEB-2018: The Latest Apache⢠OODT version 1.2.1 is now released and available for download.</p> <p><a href="http://www.apache.org/dyn/closer.lua/oodt"; class="btn btn-primary">Download OODT</a> <h2>Download OODT</h2> @@@ -110,19 -110,19 +110,20 @@@ </tr> <tr> <td> - Apache OODT 1.2 (zip) ++<<<<<<< HEAD + Apache OODT 1.2.1 (zip) </td> <td> - <a href="http://www.apache.org/dyn/closer.cgi/oodt/apache-oodt-1.2-src.zip";>apache-oodt-1.2-src.zip</a> + <a href="http://www.apache.org/dyn/closer.cgi/oodt/apache-oodt-1.2.1-src.zip";>apache-oodt-1.2.1-src.zip</a> </td> <td> - <a href="http://www.apache.org/dist/oodt/apache-oodt-1.2-src.zip.md5";>apache-oodt-1.2-src.zip.md5</a> + <a href="http://www.apache.org/dist/oodt/apache-oodt-1.2.1-src.zip.md5";>apache-oodt-1.2.1-src.zip.md5</a> </td> <td> - <a href="http://www.apache.org/dist/oodt/apache-oodt-1.2-src.zip.asc";>apache-oodt-1.2-src.zip.asc</a> + <a href="http://www.apache.org/dist/oodt/apache-oodt-1.2.1-src.zip.asc";>apache-oodt-1.2.1-src.zip.asc</a> </td> <td> - <a href="http://www.apache.org/dist/oodt/apache-oodt-1.2-src.zip.sha1";>apache-oodt-1.2-src.zip.sha1</a> + <a href="http://www.apache.org/dist/oodt/apache-oodt-1.2.1-src.zip.sha1";>apache-oodt-1.2.1-src.zip.sha1</a> </td> </tr> </table> http://git-wip-us.apache.org/repos/asf/oodt/blob/268fe571/index.html ---------------------------------------------------------------------- diff --cc index.html index fb7a6b1,6ed437f..bbc6e03 --- a/index.html +++ b/index.html @@@ -104,6 -100,10 +104,11 @@@ <li class="list-group-item"> <a href="/2016/06/26/oodt-10-released.html">Apache OODT 1.0 released</a> ++ + </li> + + <li class="list-group-item"> + <a href="/2016/02/26/oodt-012-released.html">Apache OODT 0.12 hits the shelves</a> </li> <li class="list-group-item">
![http://www.apache.org/events/current-event-234x60.png"/](http://www.apache.org/events/current-event-234x60.png"/){kind=link}