From commits-return-10185-archive-asf-public=cust-asf.ponee.io@roller.apache.org Fri Jan 18 23:36:37 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 9915B180647 for ; Fri, 18 Jan 2019 23:36:37 +0100 (CET) Received: (qmail 34023 invoked by uid 500); 18 Jan 2019 22:36:36 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 34013 invoked by uid 99); 18 Jan 2019 22:36:36 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Jan 2019 22:36:36 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3A13E8762E; Fri, 18 Jan 2019 22:36:36 +0000 (UTC) Date: Fri, 18 Jan 2019 22:36:36 +0000 To: "commits@roller.apache.org" Subject: [roller] branch master updated: From Kohei's PR MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154785099601.16685.14169931797337491606@gitbox.apache.org> From: snoopdave@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: roller X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: dda7b194d180e54f62e84ad57027778dce52bc5c X-Git-Newrev: d456d54200e7c747ef0312ca190c2a15433b6b3d X-Git-Rev: d456d54200e7c747ef0312ca190c2a15433b6b3d X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/roller.git The following commit(s) were added to refs/heads/master by this push: new d456d54 From Kohei's PR d456d54 is described below commit d456d54200e7c747ef0312ca190c2a15433b6b3d Author: Dave Johnson AuthorDate: Fri Jan 18 17:36:28 2019 -0500 From Kohei's PR --- .gitignore | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.gitignore b/.gitignore index b2e8078..24a37b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ +# Taken from http://gary-rowe.com/agilestack/2012/10/12/a-gitignore-file-for-intellij-and-eclipse-with-maven/ +# +# Eclipse +.classpath +.project +.settings/ + +# Intellij +.idea/ +*.iml +*.iws + +# Mac +.DS_Store + +# Maven +log/ +target/ + +velocity.log + tomcat-base deployment/docker-compose/postgresql-data deployment/docker-compose/roller-data