accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [1/2] accumulo git commit: Remove conflicting index file from 'jekyll new' and use jekyll --safe
Date Mon, 14 Mar 2016 23:50:46 GMT
Repository: accumulo
Updated Branches:
  refs/heads/gh-pages 01abb4be6 -> 3de6faf86


Remove conflicting index file from 'jekyll new' and use jekyll --safe


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0908bb74
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0908bb74
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0908bb74

Branch: refs/heads/gh-pages
Commit: 0908bb7415894b22f71abe54431edd03478d53e5
Parents: 01abb4b
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon Mar 14 18:53:18 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Mon Mar 14 18:53:18 2016 -0400

----------------------------------------------------------------------
 _devtools/git-hooks/post-commit |  2 +-
 index.html                      | 23 -----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0908bb74/_devtools/git-hooks/post-commit
----------------------------------------------------------------------
diff --git a/_devtools/git-hooks/post-commit b/_devtools/git-hooks/post-commit
index 627b02e..6c400c2 100755
--- a/_devtools/git-hooks/post-commit
+++ b/_devtools/git-hooks/post-commit
@@ -48,7 +48,7 @@ build_jekyll_site() {
   trap "rm -rf '""$workdir""'" 0 1 2 3 15
 
   # actually generate the site
-  jekyll build --config "$config" --destination "$workdir/_site" || die "fatal: jekyll build
failure"
+  jekyll build --config "$config" --destination "$workdir/_site" --safe || die "fatal: jekyll
build failure"
 
   # prepare and commit to the target branch
   export GIT_INDEX_FILE="$workdir/index"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0908bb74/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
deleted file mode 100644
index 83d9398..0000000
--- a/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
----
-layout: default
----
-
-<div class="home">
-
-  <h1 class="page-heading">Posts</h1>
-
-  <ul class="post-list">
-    {% for post in site.posts %}
-      <li>
-        <span class="post-meta">{{ post.date | date: "%b %-d, %Y" }}</span>
-
-        <h2>
-          <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title
}}</a>
-        </h2>
-      </li>
-    {% endfor %}
-  </ul>
-
-  <p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | prepend: site.baseurl
}}">via RSS</a></p>
-
-</div>


Mime
View raw message