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 2011/06/05 11:25:43 UTC
svn commit: r1132329 [1/6] - in /incubator/mesos/trunk: ./ src/ src/common/
src/config/ src/event_history/ src/examples/ src/local/ src/master/
src/messaging/ src/slave/ src/tests/ third_party/sqlite-3.6.23.1/
Author: benh
Date: Sun Jun 5 09:25:41 2011
New Revision: 1132329
URL: http://svn.apache.org/viewvc?rev=1132329&view=rev
Log:
Revert "Merge branch 'andyk-event-history-nowebui'".
This reverts commit 8ab692f11f9e9dbb8a487c704c865d20542233b7, reversing
changes made to 5c97f8522b40603452102911e76d73c1c1c014ae.
This commit also reverts 9dec3330cb9448b7b64e and
57170ed8e1f8aecd065f.
Conflicts:
src/common/date_utils.cpp
src/slave/slave.cpp
src/tests/date_utils_test.cpp
src/webui/master/index.tpl
Removed:
incubator/mesos/trunk/src/event_history/event_logger.cpp
incubator/mesos/trunk/src/event_history/event_logger.hpp
incubator/mesos/trunk/src/event_history/event_writer.hpp
incubator/mesos/trunk/src/event_history/file_event_writer.cpp
incubator/mesos/trunk/src/event_history/file_event_writer.hpp
incubator/mesos/trunk/src/event_history/sqlite_event_writer.cpp
incubator/mesos/trunk/src/event_history/sqlite_event_writer.hpp
incubator/mesos/trunk/src/tests/date_utils_test.cpp
incubator/mesos/trunk/src/tests/event_history_test.cpp
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/INSTALL
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/Makefile.am
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/Makefile.in
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/README
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/aclocal.m4
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/config.guess
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/config.sub
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/configure
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/configure.ac
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/depcomp
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/install-sh
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/ltmain.sh
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/missing
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/shell.c
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/sqlite3.1
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/sqlite3.c
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/sqlite3.h
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/sqlite3.pc.in
incubator/mesos/trunk/third_party/sqlite-3.6.23.1/sqlite3ext.h
Modified:
incubator/mesos/trunk/.gitignore
incubator/mesos/trunk/Makefile.in
incubator/mesos/trunk/configure
incubator/mesos/trunk/configure.ac
incubator/mesos/trunk/configure.template.centos-5.4-64
incubator/mesos/trunk/configure.template.macosx
incubator/mesos/trunk/configure.template.ubuntu-hardy-64
incubator/mesos/trunk/configure.template.ubuntu-karmic-64
incubator/mesos/trunk/configure.template.ubuntu-lucid-64
incubator/mesos/trunk/src/Makefile.in
incubator/mesos/trunk/src/common/date_utils.cpp
incubator/mesos/trunk/src/common/date_utils.hpp
incubator/mesos/trunk/src/config/config.hpp.in
incubator/mesos/trunk/src/examples/Makefile.in
incubator/mesos/trunk/src/local/local.cpp
incubator/mesos/trunk/src/master/main.cpp
incubator/mesos/trunk/src/master/master.cpp
incubator/mesos/trunk/src/master/master.hpp
incubator/mesos/trunk/src/master/state.hpp
incubator/mesos/trunk/src/messaging/messages.hpp
incubator/mesos/trunk/src/slave/slave.cpp
incubator/mesos/trunk/src/slave/webui.cpp
incubator/mesos/trunk/src/tests/Makefile.in
incubator/mesos/trunk/src/tests/master_test.cpp
Modified: incubator/mesos/trunk/.gitignore
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/.gitignore?rev=1132329&r1=1132328&r2=1132329&view=diff
==============================================================================
--- incubator/mesos/trunk/.gitignore (original)
+++ incubator/mesos/trunk/.gitignore Sun Jun 5 09:25:41 2011
@@ -87,5 +87,3 @@ src/scheduled-memhog
src/swig/java/mesos
src/swig/python/mesos.py
src/test_output
-third_party/sqlite-3.6.23.1/sqlite3
-third_party/sqlite-3.6.23.1/sqlite3.pc
Modified: incubator/mesos/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/Makefile.in?rev=1132329&r1=1132328&r2=1132329&view=diff
==============================================================================
--- incubator/mesos/trunk/Makefile.in (original)
+++ incubator/mesos/trunk/Makefile.in Sun Jun 5 09:25:41 2011
@@ -11,14 +11,10 @@ OS_NAME = @OS_NAME@
MESOS_HOME = @prefix@/mesos
-WITH_INCLUDED_SQLITE = @WITH_INCLUDED_SQLITE@
-
WITH_INCLUDED_ZOOKEEPER = @WITH_INCLUDED_ZOOKEEPER@
LIBPROCESS = third_party/libprocess
-SQLITE = third_party/sqlite-3.6.23.1
-
ZOOKEEPER = third_party/zookeeper-3.3.1/src/c
GLOG = third_party/glog-0.3.1
@@ -34,9 +30,6 @@ third_party:
$(MAKE) -C $(LIBPROCESS)
$(MAKE) -C $(GLOG)
$(MAKE) -C $(GMOCK)
-ifeq ($(WITH_INCLUDED_SQLITE),1)
- $(MAKE) -C $(SQLITE)
-endif
ifeq ($(WITH_INCLUDED_ZOOKEEPER),1)
$(MAKE) -C $(ZOOKEEPER)
endif
@@ -91,9 +84,6 @@ distclean:
$(MAKE) -C $(LIBPROCESS) distclean
$(MAKE) -C $(GLOG) distclean
$(MAKE) -C $(GMOCK) distclean
-ifeq ($(WITH_INCLUDED_SQLITE),1)
- $(MAKE) -C $(SQLITE) distclean
-endif
ifeq ($(WITH_INCLUDED_ZOOKEEPER),1)
$(MAKE) -C $(ZOOKEEPER) distclean
endif
@@ -127,9 +117,6 @@ clean:
$(MAKE) -C $(LIBPROCESS) clean
$(MAKE) -C $(GLOG) clean
$(MAKE) -C $(GMOCK) clean
-ifeq ($(WITH_INCLUDED_SQLITE),1)
- $(MAKE) -C $(SQLITE) clean
-endif
ifeq ($(WITH_INCLUDED_ZOOKEEPER),1)
$(MAKE) -C $(ZOOKEEPER) clean
endif