From 7db4a66269ff0ff593d4589262b0fd374d5cfcfa Mon Sep 17 00:00:00 2001 From: Debo Dutta Date: Thu, 17 Dec 2015 10:05:41 -0800 Subject: [PATCH 1/4] fixing an earlier git rm issue. Adding and deleting again --- .../2015-12-09-welcome-to-jekyll.markdown | 25 +++++++++++++++++++ site/_posts/2015-12-12-welcome.md | 11 -------- site/develop/index.md | 2 +- 3 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 site/_posts/2015-12-09-welcome-to-jekyll.markdown delete mode 100644 site/_posts/2015-12-12-welcome.md diff --git a/site/_posts/2015-12-09-welcome-to-jekyll.markdown b/site/_posts/2015-12-09-welcome-to-jekyll.markdown new file mode 100644 index 0000000000..8f832335ac --- /dev/null +++ b/site/_posts/2015-12-09-welcome-to-jekyll.markdown @@ -0,0 +1,25 @@ +--- +layout: post +title: "Welcome to Jekyll!" +date: 2015-12-09 11:21:58 -0800 +categories: jekyll update +--- +You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated. + +To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works. + +Jekyll also offers powerful support for code snippets: + +{% highlight ruby %} +def print_hi(name) + puts "Hi, #{name}" +end +print_hi('Tom') +#=> prints 'Hi, Tom' to STDOUT. +{% endhighlight %} + +Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk]. + +[jekyll-docs]: http://jekyllrb.com/docs/home +[jekyll-gh]: https://github.com/jekyll/jekyll +[jekyll-talk]: https://talk.jekyllrb.com/ diff --git a/site/_posts/2015-12-12-welcome.md b/site/_posts/2015-12-12-welcome.md deleted file mode 100644 index bbdf7b5ab3..0000000000 --- a/site/_posts/2015-12-12-welcome.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -layout: news_item -title: "Sample news" -date: "2015-12-12 9:15:00 -0800" -author: ddutta -categories: [team] ---- - -Metron welcomes all! - -* Bla bla bla diff --git a/site/develop/index.md b/site/develop/index.md index 351892aa7a..367b2cad72 100644 --- a/site/develop/index.md +++ b/site/develop/index.md @@ -22,7 +22,7 @@ There are several development mailing lists for Metron with archive [here](https://mail-archives.apache.org/mod_mbox/incubator-metron-dev/) * [issues@metron.incubator.apache.org](mailto:issues@metron.incubator.apache.org) - Bug tracking with archive [here](https://mail-archives.apache.org/mod_mbox/incubator-metron-issues/) -* [commits@incubator-metron.apache.org](mailto:commits@metron.incubator.apache.org) - Git tracking +* [commits@metron.incubator.apache.org](mailto:commits@metron.incubator.apache.org) - Git tracking with archive [here](https://mail-archives.apache.org/mod_mbox/incubator-metron-commits/) You can subscribe to the lists by sending email to From 5d510e90573fbe6111014438ca9e6721e1db5899 Mon Sep 17 00:00:00 2001 From: Debo Dutta Date: Thu, 17 Dec 2015 10:09:06 -0800 Subject: [PATCH 2/4] deleted the added file to fix an older issue --- .../2015-12-09-welcome-to-jekyll.markdown | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 site/_posts/2015-12-09-welcome-to-jekyll.markdown diff --git a/site/_posts/2015-12-09-welcome-to-jekyll.markdown b/site/_posts/2015-12-09-welcome-to-jekyll.markdown deleted file mode 100644 index 8f832335ac..0000000000 --- a/site/_posts/2015-12-09-welcome-to-jekyll.markdown +++ /dev/null @@ -1,25 +0,0 @@ ---- -layout: post -title: "Welcome to Jekyll!" -date: 2015-12-09 11:21:58 -0800 -categories: jekyll update ---- -You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated. - -To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works. - -Jekyll also offers powerful support for code snippets: - -{% highlight ruby %} -def print_hi(name) - puts "Hi, #{name}" -end -print_hi('Tom') -#=> prints 'Hi, Tom' to STDOUT. -{% endhighlight %} - -Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk]. - -[jekyll-docs]: http://jekyllrb.com/docs/home -[jekyll-gh]: https://github.com/jekyll/jekyll -[jekyll-talk]: https://talk.jekyllrb.com/ From 7fb7745f08ee8c74e209a24703f47a04bed43090 Mon Sep 17 00:00:00 2001 From: Debo Dutta Date: Thu, 17 Dec 2015 10:32:30 -0800 Subject: [PATCH 3/4] Took care of comments --- site/_posts/2015-12-11-metron-incubator.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 site/_posts/2015-12-11-metron-incubator.md diff --git a/site/_posts/2015-12-11-metron-incubator.md b/site/_posts/2015-12-11-metron-incubator.md new file mode 100644 index 0000000000..4efac90218 --- /dev/null +++ b/site/_posts/2015-12-11-metron-incubator.md @@ -0,0 +1,9 @@ +--- +layout: news_item +title: "Metron adopts new logo" +date: "2015-12-12 04:00:00 -0800" +author: ddutta +categories: [project] +--- + +Congratulations! Metron accepted into the Apache Incubator. From 34faa3004615c37c4117016a9200b94b2a248b3a Mon Sep 17 00:00:00 2001 From: Debo Dutta Date: Thu, 17 Dec 2015 10:42:48 -0800 Subject: [PATCH 4/4] adding the committers --- site/develop/index.md | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/site/develop/index.md b/site/develop/index.md index 367b2cad72..d8378a6f65 100644 --- a/site/develop/index.md +++ b/site/develop/index.md @@ -9,10 +9,21 @@ developers working on the project. The project has created ## Project Members -Name | Apache Id | Role -:-------------------- | :----------- | :--- -Owen O'Malley | omalley | PMC - +Name | Apache Id | Role +:---------------------- | :------------- | :--- +Owen O'Malley | omalley | PMC +Jim Baker | jimbaker | PMC +Mark Bittmann | mbittmann | PMC +Sheetal Dolas | sheetal_dolas | PMC +P. Taylor Goetz | ptgoetz | PMC +Brad Kolarov | billie | PMC +Dave Hirko | dbhirko | PMC +Larry McCay | lmccay | PMC +Charles Porter | cporter | PMC +James Sirota | jsirota | PMC +Casey Stella | cestella | PMC +Vinod Kumar Vavilapalli | vinodkv | PMC +George Vetticaden | gvetticaden | PMC ## Mailing Lists