Merge branch 'master' into move_to_0.14.8_for_millisecond_timestamps

Conflicts: config/projects/td-agent2.rb plugin_gems.rb
ConnectedHomes · Feb 13, 2017 · f0cc46a · f0cc46a
2 parents 913b09d + d70836d
commit f0cc46a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/config/projects/td-agent2.rb b/config/projects/td-agent2.rb
@@ -9,7 +9,7 @@
 
 install_dir     "/opt/td-agent"
 build_version   "0.0.0"
-build_iteration 6
+build_iteration 9
 
 # creates required build directories
 dependency "preparation"