Fixed timestamp dump to match Cascade's field order

I meant this to be compatible with the Cascade timestamp files, but
somehow mixed up the order of the columns.

include/derecho/utils/timestamp_logger.hpp

@@ -63,7 +63,7 @@ class TimestampLogger {
     /**
      * Dumps a string representation of the timestamp log to an output stream.
      * Each log entry will become one line of output with the following format:
-     * <tag> <timestamp> <node ID> <message ID> <version>
+     * <tag> <node ID> <message ID> <timestamp> <version>
      *
      * This should only be called after all timestamps are done being recorded,
      * since it holds a lock on the log for the duration of printing the output

src/core/git_version.cpp

@@ -13,8 +13,8 @@ namespace derecho {
 const int MAJOR_VERSION = 2;
 const int MINOR_VERSION = 4;
 const int PATCH_VERSION = 0;
-const int COMMITS_AHEAD_OF_VERSION = 3;
+const int COMMITS_AHEAD_OF_VERSION = 6;
 const char* VERSION_STRING = "2.4.0";
-const char* VERSION_STRING_PLUS_COMMITS = "2.4.0+3";
+const char* VERSION_STRING_PLUS_COMMITS = "2.4.0+6";
 
 }

src/utils/timestamp_logger.cpp

@@ -49,9 +49,9 @@ void TimestampLogger::instance_dump(std::ostream& output_stream) {
     }
     for(std::size_t i = 0; i < cur_index; ++i) {
         output_stream << event_log[i].event_tag << " "
-                      << duration_cast<nanoseconds>(event_log[i].time.time_since_epoch()).count() << " "
                       << my_node_id << " "
                       << event_log[i].message_id << " "
+                      << duration_cast<nanoseconds>(event_log[i].time.time_since_epoch()).count() << " "
                       << event_log[i].version << std::endl;
     }
     pthread_spin_unlock(&log_mutex);