You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/10 14:20:46 UTC

[2/3] git commit: Ignore two-dot-o's ignored files.

Ignore two-dot-o's ignored files.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0254ee82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0254ee82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0254ee82

Branch: refs/pull/60/merge
Commit: 0254ee828d61a326e27cbabed4dfb0d5cd65e6ed
Parents: 3cd006a
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Mar 10 09:06:29 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Mar 10 09:06:29 2014 -0400

----------------------------------------------------------------------
 .gitignore    | 9 ++++++++-
 stack/pom.xml | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0254ee82/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index eacfd46..2e2bcbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,11 @@ Icon
 /stack/corepersistence/priamcluster/aws.properties
 #Webstorm artifacts
 .idea/
-portal/2.0.**
\ No newline at end of file
+portal/2.0.**
+stack/corepersistence/collection/nbactions.xml
+stack/corepersistence/graph/nbactions.xml
+stack/corepersistence/model/nbactions.xml
+stack/corepersistence/nbactions.xml
+stack/corepersistence/queryindex/nbactions.xml
+stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterLexer.java
+stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterParser.java

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0254ee82/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 1e4214c..93d57a0 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1789,12 +1789,15 @@
                     <exclude>**/META-INF/**</exclude>
                     <exclude>**/dependency-reduced-pom.xml</exclude>
                     <exclude>**/QueryFilter.tokens</exclude>
+                    <exclude>**/QueryFilterLexer.java</exclude>
+                    <exclude>**/QueryFilterParser.java</exclude>
 
                     <!-- other -->
                     <exclude>**/m2/**</exclude>
                     <exclude>**/*.asc</exclude>
                     <exclude>**/src/test/resources/**</exclude>
                     <exclude>**/cloudbees.xml</exclude>
+                    <exclude>**/aws.properties</exclude>
 
                 </excludes>
             </configuration>