> On Sept. 9, 2012, 10:41 p.m., Benjamin Hindman wrote: > > Awesomeness. Just a few quick cleanups and I'll commit this. Thanks! > > Ben Mahler wrote: > alright, merged against trunk (since I see some commits were made), > required a manual fix in statistics.cpp so have a quick look at that file > > would you have preferred I didn't do that merge so that you can see the > incremental diff first?
Yes, I'd prefer to see the incremental diff. But more importantly, I'll be downloading your diff, and it shouldn't include changes that have already been committed. This is my usual work flow: (1) git checkout trunk (2) git pull (3) git checkout feature (4) git rebase trunk (5) make check (6) fix any issues (7) git diff trunk >feature.patch (8) reviewboard. Please update the diff so I can commit! - Benjamin ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/6617/#review11219 ----------------------------------------------------------- On Sept. 10, 2012, 12:27 a.m., Ben Mahler wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/6617/ > ----------------------------------------------------------- > > (Updated Sept. 10, 2012, 12:27 a.m.) > > > Review request for mesos, Benjamin Hindman, Vinod Kone, and Jie Yu. > > > Description > ------- > > Implementing the file abstraction and http endpoints for file reading / > browsing. > > > This addresses bug MESOS-255. > https://issues.apache.org/jira/browse/MESOS-255 > > > Diffs > ----- > > src/Makefile.am 767f97a > src/common/attributes.cpp 66d0b70 > src/common/resources.cpp 2cee743 > src/common/values.cpp ec341be > src/configurator/configuration.hpp e2cd1b5 > src/configurator/configurator.cpp 3916427 > src/files/files.hpp d0cab91 > src/files/files.cpp d4080d4 > src/launcher/main.cpp 06597e6 > src/linux/cgroups.cpp 6fd0df0 > src/local/local.cpp 9c1c5b6 > src/logging/logging.cpp c1a1493 > src/master/http.cpp c480bc6 > src/master/main.cpp 48859f1 > src/master/master.hpp 866f3ef > src/master/master.cpp c639031 > src/master/slaves_manager.cpp d14bccb > src/slave/http.cpp a1f7926 > src/slave/main.cpp f1aade2 > src/slave/slave.hpp b7ab2ab > src/slave/slave.cpp 3e2a8d5 > src/tests/allocator_tests.cpp 80ba39d > src/tests/allocator_zookeeper_tests.cpp c4956dc > src/tests/configurator_tests.cpp c2f5aa0 > src/tests/fault_tolerance_tests.cpp 317a96c > src/tests/files_tests.cpp PRE-CREATION > src/tests/gc_tests.cpp bb7416c > src/tests/master_detector_tests.cpp 5b2ab4f > src/tests/master_tests.cpp acccb80 > src/tests/resource_offers_tests.cpp 1d7d9ed > src/tests/stout_tests.cpp 8f4d9e7 > src/tests/utils.hpp 54da799 > src/webui/master/static/controllers.js 1606e64 > third_party/libprocess/Makefile.am 9e23024 > third_party/libprocess/include/process/http.hpp 8424ca6 > third_party/libprocess/include/process/io.hpp 6a40b18 > third_party/libprocess/include/process/nothing.hpp c11a010 > third_party/libprocess/include/process/once.hpp 46be55c > third_party/libprocess/include/process/pid.hpp 6a2eec9 > third_party/libprocess/include/stout/hashmap.hpp 51bdea0 > third_party/libprocess/include/stout/json.hpp 25dbcf4 > third_party/libprocess/include/stout/nothing.hpp PRE-CREATION > third_party/libprocess/include/stout/numify.hpp ffd83ae > third_party/libprocess/include/stout/os.hpp df0f7ff > third_party/libprocess/include/stout/path.hpp 80d9bc6 > third_party/libprocess/include/stout/stringify.hpp ad2f2fa > third_party/libprocess/include/stout/strings.hpp 0646bf9 > third_party/libprocess/src/decoder.hpp 105fe5d > third_party/libprocess/src/encoder.hpp 55b5d50 > third_party/libprocess/src/process.cpp 51dea77 > third_party/libprocess/src/statistics.cpp 6916336 > third_party/libprocess/src/tokenize.hpp f886186 > third_party/libprocess/src/tokenize.cpp 759ce5f > > Diff: https://reviews.apache.org/r/6617/diff/ > > > Testing > ------- > > Added files_tests.cpp > make check > > > Thanks, > > Ben Mahler > >
