Author: lukaszlenart
Date: Tue Feb 18 06:13:35 2014
New Revision: 1569208
URL: http://svn.apache.org/r1569208
Log:
Merge all from jekyll-powered at 1569207 (reintegration)
Added:
struts/site/trunk/_config.yml
- copied unchanged from r1569207,
struts/site/branches/jekyll-powered/_config.yml
struts/site/trunk/content/
- copied from r1569207, struts/site/branches/jekyll-powered/content/
struts/site/trunk/source/
- copied from r1569207, struts/site/branches/jekyll-powered/source/
Removed:
struts/site/trunk/pom.xml
Modified:
struts/site/trunk/ (props changed)
struts/site/trunk/build_cms.sh
struts/site/trunk/source/announce-2008.html (props changed)
Propchange: struts/site/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Feb 18 06:13:35 2014
@@ -1 +1,2 @@
struts-site.iml
+.idea
Propchange: struts/site/trunk/
------------------------------------------------------------------------------
Merged /struts/site/branches/jekyll-powered:r1565944-1569207
Modified: struts/site/trunk/build_cms.sh
URL:
http://svn.apache.org/viewvc/struts/site/trunk/build_cms.sh?rev=1569208&r1=1569207&r2=1569208&view=diff
==============================================================================
--- struts/site/trunk/build_cms.sh (original)
+++ struts/site/trunk/build_cms.sh Tue Feb 18 06:13:35 2014
@@ -1,3 +1,3 @@
#!/bin/sh
-mvn clean site
+jekyll build
Propchange: struts/site/trunk/source/announce-2008.html
------------------------------------------------------------------------------
Merged
/struts/site/branches/jekyll-powered/source/announce-2008.html:r1566350-1569207
