accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1210607 - in /incubator/accumulo/branches/1.4: ./ src/server/src/main/c++/mlock/Makefile src/server/src/main/c++/mlock/accumulo_server_tabletserver_MLock.cc src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.cc
Date Mon, 05 Dec 2011 20:21:12 GMT
Author: vines
Date: Mon Dec  5 20:21:12 2011
New Revision: 1210607

URL: http://svn.apache.org/viewvc?rev=1210607&view=rev
Log:
Accumulo-207 - merging to 1.4

Added:
    incubator/accumulo/branches/1.4/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.cc
      - copied unchanged from r1210596, incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.cc
Removed:
    incubator/accumulo/branches/1.4/src/server/src/main/c++/mlock/accumulo_server_tabletserver_MLock.cc
Modified:
    incubator/accumulo/branches/1.4/   (props changed)
    incubator/accumulo/branches/1.4/src/server/src/main/c++/mlock/Makefile

Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  5 20:21:12 2011
@@ -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,1210571
+/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,1210571,1210596,1210598
 /incubator/accumulo/branches/1.4:1205476
 /incubator/accumulo/trunk:1205476,1205570,1208726

Modified: incubator/accumulo/branches/1.4/src/server/src/main/c++/mlock/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/c%2B%2B/mlock/Makefile?rev=1210607&r1=1210606&r2=1210607&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/c++/mlock/Makefile (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/c++/mlock/Makefile Mon Dec  5 20:21:12
2011
@@ -15,7 +15,7 @@
 
 LIB=MLock
 SRCS=$(filter-out test.cc,$(wildcard *.cc))
-HDRS=$(wildcard *.h) accumulo_server_tabletserver_$(LIB).h
+HDRS=$(wildcard *.h) org_apache_accumulo_server_tabletserver_$(LIB).h
 CXX=g++
 
 ifeq ($(shell uname),Linux)
@@ -36,7 +36,7 @@ all : $(INSTALLED_LIBS)
 clean:
 	rm -f $(INSTALLED_LIBS) $(LIBS)
 
-accumulo_server_tabletserver_$(LIB).h : ../../java/org/apache/accumulo/server/tabletserver/$(LIB).java
+org_apache_accumulo_server_tabletserver_$(LIB).h : ../../java/org/apache/accumulo/server/tabletserver/$(LIB).java
 	javah -classpath ../../../../../../lib/accumulo-server-1.4.0-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
 
 $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)



Mime
View raw message