You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2012/10/19 20:14:59 UTC
svn commit: r1400207 - in /accumulo/trunk: ./ core/ server/
server/src/main/c++/Makefile server/src/main/c++/mlock/ src/
Author: vines
Date: Fri Oct 19 18:14:59 2012
New Revision: 1400207
URL: http://svn.apache.org/viewvc?rev=1400207&view=rev
Log:
ACCUMULO-796 - killing mlock.
Also more merge crap from ACCUMULO-312/ACCUMULO-791
Removed:
accumulo/trunk/server/src/main/c++/mlock/
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/c++/Makefile
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4:r1398514
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1398514
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1398514
Modified: accumulo/trunk/server/src/main/c++/Makefile
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/c%2B%2B/Makefile?rev=1400207&r1=1400206&r2=1400207&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/c++/Makefile (original)
+++ accumulo/trunk/server/src/main/c++/Makefile Fri Oct 19 18:14:59 2012
@@ -14,14 +14,10 @@
# limitations under the License.
# ya... I know, this is a bad recursive makefile...
-all: nm ml
+all: nm
nm:
cd nativeMap ; $(MAKE)
-ml:
- cd mlock ; $(MAKE)
-
clean:
cd nativeMap ; $(MAKE) $@
- cd mlock ; $(MAKE) $@
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1398514