You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2015/10/26 19:51:30 UTC
mesos git commit: Style fixes in src/Makefile.am.
Repository: mesos
Updated Branches:
refs/heads/master 9a722d742 -> 7a9b49084
Style fixes in src/Makefile.am.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7a9b4908
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7a9b4908
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7a9b4908
Branch: refs/heads/master
Commit: 7a9b490842a46c34a18b9a0748e178e9b0326d66
Parents: 9a722d7
Author: Jie Yu <yu...@gmail.com>
Authored: Mon Oct 26 11:50:50 2015 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Oct 26 11:50:50 2015 -0700
----------------------------------------------------------------------
src/Makefile.am | 446 +++++++++++++++++++++++++--------------------------
1 file changed, 223 insertions(+), 223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7a9b4908/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 5675b91..e797dac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -472,109 +472,109 @@ nodist_libmesos_no_3rdparty_la_SOURCES = \
# TODO(tillt): Remove authentication/cram_md5/* which will enable us to
# lose the immediate cyrus-sasl2 dependency.
-libmesos_no_3rdparty_la_SOURCES = \
- authentication/cram_md5/authenticatee.cpp \
- authentication/cram_md5/authenticator.cpp \
- authentication/cram_md5/auxprop.cpp \
- authorizer/authorizer.cpp \
- authorizer/local/authorizer.cpp \
- common/attributes.cpp \
- common/date_utils.cpp \
- common/http.cpp \
- common/protobuf_utils.cpp \
- common/resources.cpp \
- common/resources_utils.cpp \
- common/type_utils.cpp \
- common/values.cpp \
- docker/docker.hpp \
- docker/docker.cpp \
- docker/executor.hpp \
- exec/exec.cpp \
- files/files.cpp \
- hook/manager.cpp \
- internal/devolve.cpp \
- internal/evolve.cpp \
- local/local.cpp \
- logging/flags.cpp \
- logging/logging.cpp \
- master/contender.cpp \
- master/constants.cpp \
- master/detector.cpp \
- master/flags.cpp \
- master/http.cpp \
- master/maintenance.cpp \
- master/master.cpp \
- master/metrics.cpp \
- master/registry.hpp \
- master/registry.proto \
- master/registrar.cpp \
- master/repairer.cpp \
- master/validation.cpp \
- master/allocator/allocator.cpp \
- master/allocator/mesos/hierarchical.cpp \
- master/allocator/sorter/drf/sorter.cpp \
- messages/flags.proto \
- messages/messages.cpp \
- messages/messages.proto \
- module/manager.cpp \
- sched/constants.cpp \
- sched/sched.cpp \
- scheduler/scheduler.cpp \
- slave/constants.cpp \
- slave/gc.cpp \
- slave/flags.cpp \
- slave/http.cpp \
- slave/metrics.cpp \
- slave/monitor.cpp \
- slave/paths.cpp \
- slave/qos_controller.cpp \
- slave/qos_controllers/noop.cpp \
- slave/resource_estimator.cpp \
- slave/slave.cpp \
- slave/state.cpp \
- slave/status_update_manager.cpp \
- slave/containerizer/containerizer.cpp \
- slave/containerizer/composing.cpp \
- slave/containerizer/composing.hpp \
- slave/containerizer/docker.cpp \
- slave/containerizer/docker.hpp \
- slave/containerizer/external_containerizer.cpp \
- slave/containerizer/fetcher.cpp \
- slave/containerizer/isolator.cpp \
- slave/containerizer/launcher.cpp \
- slave/containerizer/mesos/containerizer.cpp \
- slave/containerizer/mesos/isolators/filesystem/posix.cpp \
- slave/containerizer/mesos/isolators/posix/disk.cpp \
- slave/containerizer/mesos/launch.cpp \
- slave/containerizer/mesos/provisioner/paths.cpp \
- slave/containerizer/mesos/provisioner/provisioner.cpp \
- slave/containerizer/mesos/provisioner/store.cpp \
- slave/containerizer/mesos/provisioner/appc/paths.cpp \
- slave/containerizer/mesos/provisioner/appc/spec.cpp \
- slave/containerizer/mesos/provisioner/appc/store.cpp \
- slave/containerizer/mesos/provisioner/backend.cpp \
- slave/containerizer/mesos/provisioner/backends/copy.cpp \
- slave/containerizer/mesos/provisioner/docker/local_puller.cpp \
- slave/containerizer/mesos/provisioner/docker/message.proto \
+libmesos_no_3rdparty_la_SOURCES = \
+ authentication/cram_md5/authenticatee.cpp \
+ authentication/cram_md5/authenticator.cpp \
+ authentication/cram_md5/auxprop.cpp \
+ authorizer/authorizer.cpp \
+ authorizer/local/authorizer.cpp \
+ common/attributes.cpp \
+ common/date_utils.cpp \
+ common/http.cpp \
+ common/protobuf_utils.cpp \
+ common/resources.cpp \
+ common/resources_utils.cpp \
+ common/type_utils.cpp \
+ common/values.cpp \
+ docker/docker.hpp \
+ docker/docker.cpp \
+ docker/executor.hpp \
+ exec/exec.cpp \
+ files/files.cpp \
+ hook/manager.cpp \
+ internal/devolve.cpp \
+ internal/evolve.cpp \
+ local/local.cpp \
+ logging/flags.cpp \
+ logging/logging.cpp \
+ master/contender.cpp \
+ master/constants.cpp \
+ master/detector.cpp \
+ master/flags.cpp \
+ master/http.cpp \
+ master/maintenance.cpp \
+ master/master.cpp \
+ master/metrics.cpp \
+ master/registry.hpp \
+ master/registry.proto \
+ master/registrar.cpp \
+ master/repairer.cpp \
+ master/validation.cpp \
+ master/allocator/allocator.cpp \
+ master/allocator/mesos/hierarchical.cpp \
+ master/allocator/sorter/drf/sorter.cpp \
+ messages/flags.proto \
+ messages/messages.cpp \
+ messages/messages.proto \
+ module/manager.cpp \
+ sched/constants.cpp \
+ sched/sched.cpp \
+ scheduler/scheduler.cpp \
+ slave/constants.cpp \
+ slave/gc.cpp \
+ slave/flags.cpp \
+ slave/http.cpp \
+ slave/metrics.cpp \
+ slave/monitor.cpp \
+ slave/paths.cpp \
+ slave/qos_controller.cpp \
+ slave/qos_controllers/noop.cpp \
+ slave/resource_estimator.cpp \
+ slave/slave.cpp \
+ slave/state.cpp \
+ slave/status_update_manager.cpp \
+ slave/containerizer/containerizer.cpp \
+ slave/containerizer/composing.cpp \
+ slave/containerizer/composing.hpp \
+ slave/containerizer/docker.cpp \
+ slave/containerizer/docker.hpp \
+ slave/containerizer/external_containerizer.cpp \
+ slave/containerizer/fetcher.cpp \
+ slave/containerizer/isolator.cpp \
+ slave/containerizer/launcher.cpp \
+ slave/containerizer/mesos/containerizer.cpp \
+ slave/containerizer/mesos/launch.cpp \
+ slave/containerizer/mesos/isolators/filesystem/posix.cpp \
+ slave/containerizer/mesos/isolators/posix/disk.cpp \
+ slave/containerizer/mesos/provisioner/paths.cpp \
+ slave/containerizer/mesos/provisioner/provisioner.cpp \
+ slave/containerizer/mesos/provisioner/store.cpp \
+ slave/containerizer/mesos/provisioner/appc/paths.cpp \
+ slave/containerizer/mesos/provisioner/appc/spec.cpp \
+ slave/containerizer/mesos/provisioner/appc/store.cpp \
+ slave/containerizer/mesos/provisioner/backend.cpp \
+ slave/containerizer/mesos/provisioner/backends/copy.cpp \
+ slave/containerizer/mesos/provisioner/docker/local_puller.cpp \
+ slave/containerizer/mesos/provisioner/docker/message.proto \
slave/containerizer/mesos/provisioner/docker/metadata_manager.cpp \
- slave/containerizer/mesos/provisioner/docker/paths.cpp \
- slave/containerizer/mesos/provisioner/docker/puller.cpp \
+ slave/containerizer/mesos/provisioner/docker/paths.cpp \
+ slave/containerizer/mesos/provisioner/docker/puller.cpp \
slave/containerizer/mesos/provisioner/docker/registry_client.cpp \
slave/containerizer/mesos/provisioner/docker/spec.cpp \
- slave/containerizer/mesos/provisioner/docker/store.cpp \
- slave/containerizer/mesos/provisioner/docker/token_manager.cpp \
- slave/resource_estimators/noop.cpp \
- usage/usage.cpp \
- v1/attributes.cpp \
- v1/mesos.cpp \
- v1/resources.cpp \
- v1/values.cpp \
- version/version.cpp \
- watcher/whitelist_watcher.cpp \
- zookeeper/contender.cpp \
- zookeeper/detector.cpp \
- zookeeper/zookeeper.cpp \
- zookeeper/authentication.cpp \
+ slave/containerizer/mesos/provisioner/docker/store.cpp \
+ slave/containerizer/mesos/provisioner/docker/token_manager.cpp \
+ slave/resource_estimators/noop.cpp \
+ usage/usage.cpp \
+ v1/attributes.cpp \
+ v1/mesos.cpp \
+ v1/resources.cpp \
+ v1/values.cpp \
+ version/version.cpp \
+ watcher/whitelist_watcher.cpp \
+ zookeeper/contender.cpp \
+ zookeeper/detector.cpp \
+ zookeeper/zookeeper.cpp \
+ zookeeper/authentication.cpp \
zookeeper/group.cpp
@@ -734,9 +734,9 @@ if OS_LINUX
libmesos_no_3rdparty_la_SOURCES += slave/containerizer/mesos/isolators/cgroups/cpushare.cpp
libmesos_no_3rdparty_la_SOURCES += slave/containerizer/mesos/isolators/cgroups/mem.cpp
libmesos_no_3rdparty_la_SOURCES += slave/containerizer/mesos/isolators/cgroups/perf_event.cpp
- libmesos_no_3rdparty_la_SOURCES += slave/containerizer/mesos/isolators/namespaces/pid.cpp
libmesos_no_3rdparty_la_SOURCES += slave/containerizer/mesos/isolators/filesystem/linux.cpp
libmesos_no_3rdparty_la_SOURCES += slave/containerizer/mesos/isolators/filesystem/shared.cpp
+ libmesos_no_3rdparty_la_SOURCES += slave/containerizer/mesos/isolators/namespaces/pid.cpp
libmesos_no_3rdparty_la_SOURCES += slave/containerizer/mesos/provisioner/backends/bind.cpp
else
EXTRA_DIST += linux/cgroups.cpp
@@ -785,131 +785,131 @@ if WITH_NETWORK_ISOLATOR
slave/containerizer/mesos/isolators/network/port_mapping.hpp
endif
-libmesos_no_3rdparty_la_SOURCES += \
- authentication/cram_md5/authenticatee.hpp \
- authentication/cram_md5/authenticator.hpp \
- authentication/cram_md5/auxprop.hpp \
- authorizer/local/authorizer.hpp \
- common/build.hpp \
- common/date_utils.hpp \
- common/http.hpp \
- common/parse.hpp \
- common/protobuf_utils.hpp \
- common/recordio.hpp \
- common/resources_utils.hpp \
- common/status_utils.hpp \
- credentials/credentials.hpp \
- examples/test_anonymous_module.hpp \
- examples/test_module.hpp \
- examples/utils.hpp \
- files/files.hpp \
- hdfs/hdfs.hpp \
- hook/manager.hpp \
- internal/devolve.hpp \
- internal/evolve.hpp \
- linux/cgroups.hpp \
- linux/fs.hpp \
- linux/ns.hpp \
- linux/perf.hpp \
- linux/sched.hpp \
- linux/systemd.hpp \
- local/flags.hpp \
- local/local.hpp \
- logging/flags.hpp \
- logging/logging.hpp \
- master/contender.hpp \
- master/constants.hpp \
- master/detector.hpp \
- master/flags.hpp \
- master/machine.hpp \
- master/maintenance.hpp \
- master/master.hpp \
- master/metrics.hpp \
- master/repairer.hpp \
- master/registrar.hpp \
- master/validation.hpp \
- master/allocator/mesos/allocator.hpp \
- master/allocator/mesos/hierarchical.hpp \
- master/allocator/sorter/drf/sorter.hpp \
- master/allocator/sorter/sorter.hpp \
- messages/flags.hpp \
- messages/messages.hpp \
- module/manager.hpp \
- sched/constants.hpp \
- sched/flags.hpp \
- slave/constants.hpp \
- slave/flags.hpp \
- slave/gc.hpp \
- slave/metrics.hpp \
- slave/monitor.hpp \
- slave/paths.hpp \
- slave/slave.hpp \
- slave/state.hpp \
- slave/status_update_manager.hpp \
- slave/containerizer/containerizer.hpp \
- slave/containerizer/external_containerizer.hpp \
- slave/containerizer/fetcher.hpp \
- slave/containerizer/isolator.hpp \
- slave/containerizer/launcher.hpp \
- slave/containerizer/linux_launcher.hpp \
- slave/containerizer/mesos/containerizer.hpp \
- slave/containerizer/mesos/isolators/posix.hpp \
- slave/containerizer/mesos/isolators/posix/disk.hpp \
- slave/containerizer/mesos/isolators/cgroups/constants.hpp \
- slave/containerizer/mesos/isolators/cgroups/cpushare.hpp \
- slave/containerizer/mesos/isolators/cgroups/mem.hpp \
- slave/containerizer/mesos/isolators/cgroups/perf_event.hpp \
- slave/containerizer/mesos/isolators/namespaces/pid.hpp \
- slave/containerizer/mesos/isolators/filesystem/linux.hpp \
- slave/containerizer/mesos/isolators/filesystem/posix.hpp \
- slave/containerizer/mesos/isolators/filesystem/shared.hpp \
- slave/containerizer/mesos/launch.hpp \
- slave/containerizer/mesos/provisioner/paths.hpp \
- slave/containerizer/mesos/provisioner/provisioner.hpp \
- slave/containerizer/mesos/provisioner/store.hpp \
- slave/containerizer/mesos/provisioner/appc/paths.hpp \
- slave/containerizer/mesos/provisioner/appc/spec.hpp \
- slave/containerizer/mesos/provisioner/appc/store.hpp \
- slave/containerizer/mesos/provisioner/backend.hpp \
- slave/containerizer/mesos/provisioner/backends/bind.hpp \
- slave/containerizer/mesos/provisioner/backends/copy.hpp \
- slave/containerizer/mesos/provisioner/docker/local_puller.hpp \
- slave/containerizer/mesos/provisioner/docker/message.hpp \
+libmesos_no_3rdparty_la_SOURCES += \
+ authentication/cram_md5/authenticatee.hpp \
+ authentication/cram_md5/authenticator.hpp \
+ authentication/cram_md5/auxprop.hpp \
+ authorizer/local/authorizer.hpp \
+ common/build.hpp \
+ common/date_utils.hpp \
+ common/http.hpp \
+ common/parse.hpp \
+ common/protobuf_utils.hpp \
+ common/recordio.hpp \
+ common/resources_utils.hpp \
+ common/status_utils.hpp \
+ credentials/credentials.hpp \
+ examples/test_anonymous_module.hpp \
+ examples/test_module.hpp \
+ examples/utils.hpp \
+ files/files.hpp \
+ hdfs/hdfs.hpp \
+ hook/manager.hpp \
+ internal/devolve.hpp \
+ internal/evolve.hpp \
+ linux/cgroups.hpp \
+ linux/fs.hpp \
+ linux/ns.hpp \
+ linux/perf.hpp \
+ linux/sched.hpp \
+ linux/systemd.hpp \
+ local/flags.hpp \
+ local/local.hpp \
+ logging/flags.hpp \
+ logging/logging.hpp \
+ master/contender.hpp \
+ master/constants.hpp \
+ master/detector.hpp \
+ master/flags.hpp \
+ master/machine.hpp \
+ master/maintenance.hpp \
+ master/master.hpp \
+ master/metrics.hpp \
+ master/repairer.hpp \
+ master/registrar.hpp \
+ master/validation.hpp \
+ master/allocator/mesos/allocator.hpp \
+ master/allocator/mesos/hierarchical.hpp \
+ master/allocator/sorter/drf/sorter.hpp \
+ master/allocator/sorter/sorter.hpp \
+ messages/flags.hpp \
+ messages/messages.hpp \
+ module/manager.hpp \
+ sched/constants.hpp \
+ sched/flags.hpp \
+ slave/constants.hpp \
+ slave/flags.hpp \
+ slave/gc.hpp \
+ slave/metrics.hpp \
+ slave/monitor.hpp \
+ slave/paths.hpp \
+ slave/slave.hpp \
+ slave/state.hpp \
+ slave/status_update_manager.hpp \
+ slave/containerizer/containerizer.hpp \
+ slave/containerizer/external_containerizer.hpp \
+ slave/containerizer/fetcher.hpp \
+ slave/containerizer/isolator.hpp \
+ slave/containerizer/launcher.hpp \
+ slave/containerizer/linux_launcher.hpp \
+ slave/containerizer/mesos/containerizer.hpp \
+ slave/containerizer/mesos/launch.hpp \
+ slave/containerizer/mesos/isolators/posix.hpp \
+ slave/containerizer/mesos/isolators/posix/disk.hpp \
+ slave/containerizer/mesos/isolators/cgroups/constants.hpp \
+ slave/containerizer/mesos/isolators/cgroups/cpushare.hpp \
+ slave/containerizer/mesos/isolators/cgroups/mem.hpp \
+ slave/containerizer/mesos/isolators/cgroups/perf_event.hpp \
+ slave/containerizer/mesos/isolators/filesystem/linux.hpp \
+ slave/containerizer/mesos/isolators/filesystem/posix.hpp \
+ slave/containerizer/mesos/isolators/filesystem/shared.hpp \
+ slave/containerizer/mesos/isolators/namespaces/pid.hpp \
+ slave/containerizer/mesos/provisioner/paths.hpp \
+ slave/containerizer/mesos/provisioner/provisioner.hpp \
+ slave/containerizer/mesos/provisioner/store.hpp \
+ slave/containerizer/mesos/provisioner/appc/paths.hpp \
+ slave/containerizer/mesos/provisioner/appc/spec.hpp \
+ slave/containerizer/mesos/provisioner/appc/store.hpp \
+ slave/containerizer/mesos/provisioner/backend.hpp \
+ slave/containerizer/mesos/provisioner/backends/bind.hpp \
+ slave/containerizer/mesos/provisioner/backends/copy.hpp \
+ slave/containerizer/mesos/provisioner/docker/local_puller.hpp \
+ slave/containerizer/mesos/provisioner/docker/message.hpp \
slave/containerizer/mesos/provisioner/docker/metadata_manager.hpp \
- slave/containerizer/mesos/provisioner/docker/paths.hpp \
- slave/containerizer/mesos/provisioner/docker/puller.hpp \
+ slave/containerizer/mesos/provisioner/docker/paths.hpp \
+ slave/containerizer/mesos/provisioner/docker/puller.hpp \
slave/containerizer/mesos/provisioner/docker/registry_client.hpp \
slave/containerizer/mesos/provisioner/docker/spec.hpp \
- slave/containerizer/mesos/provisioner/docker/store.hpp \
- slave/containerizer/mesos/provisioner/docker/token_manager.hpp \
- slave/qos_controllers/noop.hpp \
- slave/resource_estimators/noop.hpp \
- tests/cluster.hpp \
- tests/containerizer.hpp \
- tests/environment.hpp \
- tests/flags.hpp \
- tests/limiter.hpp \
- tests/mesos.hpp \
- tests/module.hpp \
- tests/script.hpp \
- tests/utils.hpp \
- tests/zookeeper.hpp \
- tests/zookeeper_test_server.hpp \
- tests/containerizer/isolator.hpp \
- tests/containerizer/launcher.hpp \
- tests/containerizer/memory_test_helper.hpp \
- tests/containerizer/provisioner.hpp \
- tests/containerizer/rootfs.hpp \
- tests/containerizer/setns_test_helper.hpp \
- usage/usage.hpp \
- version/version.hpp \
- watcher/whitelist_watcher.hpp \
- zookeeper/authentication.hpp \
- zookeeper/contender.hpp \
- zookeeper/detector.hpp \
- zookeeper/group.hpp \
- zookeeper/url.hpp \
- zookeeper/watcher.hpp \
+ slave/containerizer/mesos/provisioner/docker/store.hpp \
+ slave/containerizer/mesos/provisioner/docker/token_manager.hpp \
+ slave/qos_controllers/noop.hpp \
+ slave/resource_estimators/noop.hpp \
+ tests/cluster.hpp \
+ tests/containerizer.hpp \
+ tests/environment.hpp \
+ tests/flags.hpp \
+ tests/limiter.hpp \
+ tests/mesos.hpp \
+ tests/module.hpp \
+ tests/script.hpp \
+ tests/utils.hpp \
+ tests/zookeeper.hpp \
+ tests/zookeeper_test_server.hpp \
+ tests/containerizer/isolator.hpp \
+ tests/containerizer/launcher.hpp \
+ tests/containerizer/memory_test_helper.hpp \
+ tests/containerizer/provisioner.hpp \
+ tests/containerizer/rootfs.hpp \
+ tests/containerizer/setns_test_helper.hpp \
+ usage/usage.hpp \
+ version/version.hpp \
+ watcher/whitelist_watcher.hpp \
+ zookeeper/authentication.hpp \
+ zookeeper/contender.hpp \
+ zookeeper/detector.hpp \
+ zookeeper/group.hpp \
+ zookeeper/url.hpp \
+ zookeeper/watcher.hpp \
zookeeper/zookeeper.hpp
libmesos_no_3rdparty_la_CPPFLAGS = $(MESOS_CPPFLAGS)