You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@mesos.apache.org by be...@apache.org on 2012/08/20 21:12:50 UTC

svn commit: r1375169 - /incubator/mesos/trunk/src/tests/master_tests.cpp

Author: benh
Date: Mon Aug 20 19:12:50 2012
New Revision: 1375169

URL: http://svn.apache.org/viewvc?rev=1375169&view=rev
Log:
Fixing syntax bug.

Modified:
    incubator/mesos/trunk/src/tests/master_tests.cpp

Modified: incubator/mesos/trunk/src/tests/master_tests.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/master_tests.cpp?rev=1375169&r1=1375168&r2=1375169&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/master_tests.cpp (original)
+++ incubator/mesos/trunk/src/tests/master_tests.cpp Mon Aug 20 19:12:50 2012
@@ -301,7 +301,7 @@ TEST(MasterTest, RecoverResources)
   BasicMasterDetector detector(master, slave, true);
 
   ExecutorInfo executorInfo;
-  executorInfo.mergeFrom(DEFAULT_EXECUTOR_INFO);
+  executorInfo.MergeFrom(DEFAULT_EXECUTOR_INFO);
 
   Resources executorResources = Resources::parse(
       "cpus:0.3;mem:200;ports:[5-8, 23-25]");