diff --git a/aux/binpac b/aux/binpac index 56ae73ab99..dd1a3a95f0 160000 --- a/aux/binpac +++ b/aux/binpac @@ -1 +1 @@ -Subproject commit 56ae73ab995dda665d8918d1a6b3af39b15991e3 +Subproject commit dd1a3a95f07082efcd5274b21104a038d523d132 diff --git a/aux/bro-aux b/aux/bro-aux index 12d32194c1..a59b35bdad 160000 --- a/aux/bro-aux +++ b/aux/bro-aux @@ -1 +1 @@ -Subproject commit 12d32194c19d2dce06818588a2aeccf234de1889 +Subproject commit a59b35bdada8f70fb1a59bf7bb2976534c86d378 diff --git a/aux/broccoli b/aux/broccoli index 60898666ba..a4046c2f79 160000 --- a/aux/broccoli +++ b/aux/broccoli @@ -1 +1 @@ -Subproject commit 60898666ba1df1913c08ad5045b1e56f974060cc +Subproject commit a4046c2f79b6ab0ac19ae8be94b79c6ce578bea7 diff --git a/aux/broctl b/aux/broctl index d50e0efe13..c86b7e990b 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit d50e0efe133c50d824753c86d068467e54a3c47d +Subproject commit c86b7e990b4d39cd48c0cb692077aa081b418149 diff --git a/aux/btest b/aux/btest index 1897d224ce..c8e8fe477b 160000 --- a/aux/btest +++ b/aux/btest @@ -1 +1 @@ -Subproject commit 1897d224ce295e91d20e458851759c99734a0a74 +Subproject commit c8e8fe477b5dec635e5ce00f3f764fad069c549c diff --git a/cmake b/cmake index d394eadf12..60b2873937 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit d394eadf123f9ff972be4508d34b9614ebcc32a4 +Subproject commit 60b28739379da75f26c5c2a312b7886f5209a1cc diff --git a/src/logging/writers/DataSeries.cc b/src/logging/writers/DataSeries.cc index bd1da57403..32a93a5dd4 100644 --- a/src/logging/writers/DataSeries.cc +++ b/src/logging/writers/DataSeries.cc @@ -194,12 +194,13 @@ std::string DataSeries::GetDSOptionsForType(const threading::Field *field) case TYPE_INTERVAL: { std::string s; - s += "pack_relative=\"" + std::string(field->name) + "\""; + s += "pack_relative=\"" + std::string(field->name) + "\" "; + s += "print_format=\"%.6f\" "; if ( ! ds_use_integer_for_time ) - s += " pack_scale=\"1000\" pack_scale_warn=\"no\""; + s += "pack_scale=\"1000\" pack_scale_warn=\"no\""; else - s += string(" units=\"") + TIME_UNIT() + "\" epoch=\"unix\""; + s += string("units=\"") + TIME_UNIT() + "\" epoch=\"unix\""; return s; }