You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/03/28 19:26:11 UTC
svn commit: r1462248 - in /accumulo/trunk: ./ assemble/ core/ examples/
fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
server/ server/src/main/c++/nativeMap/Makefile src/
Author: ecn
Date: Thu Mar 28 18:26:10 2013
New Revision: 1462248
URL: http://svn.apache.org/r1462248
Log:
ACCUMULO-1180 testing DARCH=both
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/c++/nativeMap/Makefile
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1462247
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1462247
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1462247
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1462247
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1462247
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1462247
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1462247
Modified: accumulo/trunk/server/src/main/c++/nativeMap/Makefile
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/c%2B%2B/nativeMap/Makefile?rev=1462248&r1=1462247&r2=1462248&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/c++/nativeMap/Makefile (original)
+++ accumulo/trunk/server/src/main/c++/nativeMap/Makefile Thu Mar 28 18:26:10 2013
@@ -29,10 +29,10 @@ ifeq ($(shell uname),Linux)
LIBS := $(LIBS_32)
endif
ifeq ($(DARCH),both)
- LIBS := $(LIBS_64)$(LIBS_32)
+ LIBS := $(LIBS_64) $(LIBS_32)
endif
ifeq ($(LIBS),)
- LIBS := $(LIBS_64)$(LIBS_32)
+ LIBS := $(LIBS_64) $(LIBS_32)
endif
else
DARCH := $(shell getconf LONG_BIT)
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1462247