/[Apache-SVN]
ViewVC logotype

Revision 1195609


Jump to revision: Previous Next
Author: benh
Date: Mon Oct 31 18:49:26 2011 UTC (12 years, 4 months ago)
Changed paths: 1000 (showing only 100; show all)
Log Message:
Still needed to fix a conflict after merge with gitub via strategy recursive option ours.

Changed paths

Path Details
Directoryincubator/mesos/trunk/Makefile.in modified , text changed
Directoryincubator/mesos/trunk/configure modified , text changed
Directoryincubator/mesos/trunk/configure.ac modified , text changed
Directoryincubator/mesos/trunk/configure.template.ubuntu-natty-64 added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64/root/mesos-ec2/mesos-daemon modified , text changed
Directoryincubator/mesos/trunk/ec2/deploy.amazon64/root/mesos-ec2/setup modified , text changed
Directoryincubator/mesos/trunk/ec2/deploy.amazon64/root/spark/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64/root/spark/conf/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64/root/spark/conf/spark-env.sh added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/ephemeral-hdfs/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/ephemeral-hdfs/conf/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/ephemeral-hdfs/conf/core-site.xml added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/ephemeral-hdfs/conf/hadoop-env.sh added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/ephemeral-hdfs/conf/hdfs-site.xml added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/ephemeral-hdfs/conf/mapred-site.xml added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/ephemeral-hdfs/conf/masters added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/ephemeral-hdfs/conf/slaves added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/cluster-url added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/copy-dir added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/create-swap added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/hadoop-framework-conf/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/hadoop-framework-conf/core-site.xml added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/hadoop-framework-conf/hadoop-env.sh added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/hadoop-framework-conf/mapred-site.xml added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/haproxy+apache/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/haproxy+apache/haproxy.config.template added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/hypertable/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/hypertable/Capfile added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/hypertable/hypertable.cfg added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/masters added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/mesos-daemon
(Copied from incubator/mesos/trunk/ec2/deploy.amazon64/root/mesos-ec2/mesos-daemon, r1142885)
added , text changed
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/redeploy-mesos added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/setup
(Copied from incubator/mesos/trunk/ec2/deploy.amazon64/root/mesos-ec2/setup, r1142885)
added , text changed
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/setup-slave added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/setup-torque added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/slaves added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/ssh-no-keychecking added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/start-hypertable added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/start-mesos added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/stop-hypertable added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/stop-mesos added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/mesos-ec2/zoo added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/persistent-hdfs/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/persistent-hdfs/conf/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/persistent-hdfs/conf/core-site.xml added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/persistent-hdfs/conf/hadoop-env.sh added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/persistent-hdfs/conf/hdfs-site.xml added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/persistent-hdfs/conf/mapred-site.xml added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/persistent-hdfs/conf/masters added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/persistent-hdfs/conf/slaves added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/spark/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/spark/conf/ added
Directoryincubator/mesos/trunk/ec2/deploy.amazon64-new/root/spark/conf/spark-env.sh added
Directoryincubator/mesos/trunk/ec2/mesos_ec2.py modified , text changed
Directoryincubator/mesos/trunk/frameworks/mpi/nmpiexec modified , text changed
Directoryincubator/mesos/trunk/frameworks/mpi/nmpiexec.py modified , text changed
Directoryincubator/mesos/trunk/frameworks/mpi/startmpd.py modified , text changed
Directoryincubator/mesos/trunk/frameworks/mpi/startmpd.sh modified , text changed
Directoryincubator/mesos/trunk/include/mesos/executor.hpp modified , text changed
Directoryincubator/mesos/trunk/include/mesos/mesos.proto modified , text changed
Directoryincubator/mesos/trunk/include/mesos/scheduler.hpp modified , text changed
Directoryincubator/mesos/trunk/src/Makefile.in modified , text changed
Directoryincubator/mesos/trunk/src/common/factory.hpp modified , text changed
Directoryincubator/mesos/trunk/src/common/hashmap.hpp modified , text changed
Directoryincubator/mesos/trunk/src/common/hashset.hpp modified , text changed
Directoryincubator/mesos/trunk/src/common/json.hpp added
Directoryincubator/mesos/trunk/src/common/lambda.hpp added
Directoryincubator/mesos/trunk/src/common/logging.cpp modified , text changed
Directoryincubator/mesos/trunk/src/common/logging.hpp modified , text changed
Directoryincubator/mesos/trunk/src/common/multihashmap.hpp added
Directoryincubator/mesos/trunk/src/common/option.hpp modified , text changed
Directoryincubator/mesos/trunk/src/common/process_utils.hpp added
Directoryincubator/mesos/trunk/src/common/resources.cpp modified , text changed
Directoryincubator/mesos/trunk/src/common/resources.hpp modified , text changed
Directoryincubator/mesos/trunk/src/common/result.hpp modified , text changed
Directoryincubator/mesos/trunk/src/common/seconds.hpp added
Directoryincubator/mesos/trunk/src/common/strings.hpp added
Directoryincubator/mesos/trunk/src/common/try.hpp added
Directoryincubator/mesos/trunk/src/common/type_utils.hpp modified , text changed
Directoryincubator/mesos/trunk/src/common/utils.cpp added
Directoryincubator/mesos/trunk/src/common/utils.hpp modified , text changed
Directoryincubator/mesos/trunk/src/common/uuid.hpp modified , text changed
Directoryincubator/mesos/trunk/src/configurator/configuration.hpp modified , text changed
Directoryincubator/mesos/trunk/src/configurator/configurator.cpp modified , text changed
Directoryincubator/mesos/trunk/src/configurator/configurator.hpp modified , text changed
Directoryincubator/mesos/trunk/src/deploy/mesos-daemon modified , text changed
Directoryincubator/mesos/trunk/src/deploy/start-slaves modified , text changed
Directoryincubator/mesos/trunk/src/detector/detector.cpp modified , text changed
Directoryincubator/mesos/trunk/src/detector/url_processor.cpp modified , text changed
Directoryincubator/mesos/trunk/src/detector/url_processor.hpp modified , text changed
Directoryincubator/mesos/trunk/src/examples/cpp_test_framework.cpp modified , text changed
Directoryincubator/mesos/trunk/src/examples/java/TestExceptionFramework.java modified , text changed
Directoryincubator/mesos/trunk/src/examples/java/TestFramework.java modified , text changed
Directoryincubator/mesos/trunk/src/examples/java/TestMultipleExecutorsFramework.java modified , text changed
Directoryincubator/mesos/trunk/src/examples/long_lived_framework.cpp modified , text changed
Directoryincubator/mesos/trunk/src/examples/memhog.cpp modified , text changed
Directoryincubator/mesos/trunk/src/examples/python/Makefile.in modified , text changed
[...]

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26