You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2012/01/26 16:01:54 UTC
svn commit: r1236221 - in /incubator/accumulo/trunk: ./ .gitignore src/core/
src/server/
Author: billie
Date: Thu Jan 26 15:01:54 2012
New Revision: 1236221
URL: http://svn.apache.org/viewvc?rev=1236221&view=rev
Log:
ACCUMULO-339 added dirs to gitignore - merged to trunk
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/.gitignore
incubator/accumulo/trunk/src/core/ (props changed)
incubator/accumulo/trunk/src/server/ (props changed)
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 26 15:01:54 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043
/incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1235917
+/incubator/accumulo/branches/1.4:1201902-1236217
Modified: incubator/accumulo/trunk/.gitignore
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/.gitignore?rev=1236221&r1=1236220&r2=1236221&view=diff
==============================================================================
--- incubator/accumulo/trunk/.gitignore (original)
+++ incubator/accumulo/trunk/.gitignore Thu Jan 26 15:01:54 2012
@@ -73,6 +73,23 @@
/src/examples/.classpath
/src/examples/.project
+# /src/examples/simple/
+/src/examples/simple/target
+
+# /src/examples/wikisearch/
+/src/examples/wikisearch/target
+
+# /src/examples/wikisearch/ingest/
+/src/examples/wikisearch/ingest/target
+/src/examples/wikisearch/ingest/lib
+
+# /src/examples/wikisearch/query/
+/src/examples/wikisearch/query/lib
+/src/examples/wikisearch/query/target
+
+# /src/examples/wikisearch/query-war/
+/src/examples/wikisearch/query-war/target
+
# /src/server/
/src/server/target
/src/server/.project
Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 26 15:01:54 2012
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3.5rc/src/core:1209938
/incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
-/incubator/accumulo/branches/1.4/src/core:1201902-1235917
+/incubator/accumulo/branches/1.3.5rc/src/core:1209938
+/incubator/accumulo/branches/1.4/src/core:1201902-1236217
Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 26 15:01:54 2012
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3.5rc/src/server:1209938
/incubator/accumulo/branches/1.3/src/server:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611
-/incubator/accumulo/branches/1.4/src/server:1201902-1235917
+/incubator/accumulo/branches/1.3.5rc/src/server:1209938
+/incubator/accumulo/branches/1.4/src/server:1201902-1236217