Change in asterixdb[master]: Some Cleanup, Additions to .gitignore

2016-07-21 Thread Michael Blow (Code Review)
Michael Blow has submitted this change and it was merged.

Change subject: Some Cleanup, Additions to .gitignore
..


Some Cleanup, Additions to .gitignore

Change-Id: I624e42a2719065c26ff4cb70ab317bcce150471c
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1013
Tested-by: Jenkins 
Reviewed-by: Till Westmann 
Integration-Tests: Jenkins 
---
M .gitignore
1 file changed, 17 insertions(+), 26 deletions(-)

Approvals:
  Till Westmann: Looks good to me, approved
  Jenkins: Verified; Verified



diff --git a/.gitignore b/.gitignore
index 636fb2f..b4129bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,34 +11,27 @@
 ittest
 asterix_logs
 build
-bin
-asterixdb/asterix-opt/
-asterixdb/asterix-app/src/test/resources/externallib/
-asterixdb/asterix-app/rttest/
-asterixdb/asterix-app/mdtest/
-asterixdb/asterix-app/opttest/
-asterixdb/asterix-app/parserts/
-asterixdb/asterix-app/library/
-asterixdb/asterix-app/opt_parserts/
-asterixdb/asterix-app/runtime_parserts/
+asterixdb/asterix-opt
+asterixdb/asterix-app/src/test/resources/externallib
+asterixdb/asterix-app/rttest
+asterixdb/asterix-app/mdtest
+asterixdb/asterix-app/opttest
+asterixdb/asterix-app/parserts
+asterixdb/asterix-app/library
+asterixdb/asterix-app/opt_parserts
+asterixdb/asterix-app/runtime_parserts
 asterixdb/asterix-app/data/csv/beer.csv
-asterixdb/asterix-installer/ittest/
-asterixdb/asterix-installer/repliationtest/
-asterixdb/asterix-installer/src/test/resources/clusterts/asterix-installer-*-SNAPSHOT-binary-assembly/
-build
-asterix_logs
-bin/
+asterixdb/asterix-installer/ittest
+asterixdb/asterix-installer/repliationtest
+asterixdb/asterix-installer/src/test/resources/clusterts/asterix-installer-*-SNAPSHOT-binary-assembly
 *-coredump
 *.pyc
 *.iml
-asterix-app/data/csv/beer.csv
-.idea/
-asterix.ipr
-asterix.iws
+.idea
+*.ipr
+*.iws
 git.properties
 actual
-build
-edu.uci.ics.hyracks.control.nc.NodeControllerService
 exception
 expected
 teststore1
@@ -54,8 +47,6 @@
 output
 tmp
 dist
-*.iml
-.idea/
-asterixdb/asterix-opt
 *~
-
+*.swp
+.m2*

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1013
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I624e42a2719065c26ff4cb70ab317bcce150471c
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 


Change in asterixdb[master]: Some Cleanup, Additions to .gitignore

2016-07-21 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Some Cleanup, Additions to .gitignore
..


Patch Set 1: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/127/ : 
SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1013
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I624e42a2719065c26ff4cb70ab317bcce150471c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No


Change in asterixdb[master]: Some Cleanup, Additions to .gitignore

2016-07-21 Thread Till Westmann (Code Review)
Till Westmann has posted comments on this change.

Change subject: Some Cleanup, Additions to .gitignore
..


Patch Set 1: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1013
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I624e42a2719065c26ff4cb70ab317bcce150471c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No


Change in asterixdb[master]: Some Cleanup, Additions to .gitignore

2016-07-21 Thread Jenkins (Code Review)
Jenkins has posted comments on this change.

Change subject: Some Cleanup, Additions to .gitignore
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/1953/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1013
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I624e42a2719065c26ff4cb70ab317bcce150471c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No


Change in asterixdb[master]: Some Cleanup, Additions to .gitignore

2016-07-21 Thread Michael Blow (Code Review)
Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1013

Change subject: Some Cleanup, Additions to .gitignore
..

Some Cleanup, Additions to .gitignore

Change-Id: I624e42a2719065c26ff4cb70ab317bcce150471c
---
M .gitignore
1 file changed, 17 insertions(+), 26 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/13/1013/1

diff --git a/.gitignore b/.gitignore
index 636fb2f..b4129bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,34 +11,27 @@
 ittest
 asterix_logs
 build
-bin
-asterixdb/asterix-opt/
-asterixdb/asterix-app/src/test/resources/externallib/
-asterixdb/asterix-app/rttest/
-asterixdb/asterix-app/mdtest/
-asterixdb/asterix-app/opttest/
-asterixdb/asterix-app/parserts/
-asterixdb/asterix-app/library/
-asterixdb/asterix-app/opt_parserts/
-asterixdb/asterix-app/runtime_parserts/
+asterixdb/asterix-opt
+asterixdb/asterix-app/src/test/resources/externallib
+asterixdb/asterix-app/rttest
+asterixdb/asterix-app/mdtest
+asterixdb/asterix-app/opttest
+asterixdb/asterix-app/parserts
+asterixdb/asterix-app/library
+asterixdb/asterix-app/opt_parserts
+asterixdb/asterix-app/runtime_parserts
 asterixdb/asterix-app/data/csv/beer.csv
-asterixdb/asterix-installer/ittest/
-asterixdb/asterix-installer/repliationtest/
-asterixdb/asterix-installer/src/test/resources/clusterts/asterix-installer-*-SNAPSHOT-binary-assembly/
-build
-asterix_logs
-bin/
+asterixdb/asterix-installer/ittest
+asterixdb/asterix-installer/repliationtest
+asterixdb/asterix-installer/src/test/resources/clusterts/asterix-installer-*-SNAPSHOT-binary-assembly
 *-coredump
 *.pyc
 *.iml
-asterix-app/data/csv/beer.csv
-.idea/
-asterix.ipr
-asterix.iws
+.idea
+*.ipr
+*.iws
 git.properties
 actual
-build
-edu.uci.ics.hyracks.control.nc.NodeControllerService
 exception
 expected
 teststore1
@@ -54,8 +47,6 @@
 output
 tmp
 dist
-*.iml
-.idea/
-asterixdb/asterix-opt
 *~
-
+*.swp
+.m2*

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1013
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I624e42a2719065c26ff4cb70ab317bcce150471c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow