Merge branch '2.1' into develop

2017-03-09 10:02:36 +02:00
parent e1a1959bc2 41ff01d16d
commit 415001a4cd
19 changed files with 210 additions and 42 deletions
--- a/include/maxscale/version.h.in
+++ b/include/maxscale/version.h.in
@ -1,2 +1,5 @@
 #define MAXSCALE_VERSION "@MAXSCALE_VERSION@"
 #define MAXSCALE_COMMIT "@MAXSCALE_COMMIT@"
+#define MAXSCALE_SOURCE "@MAXSCALE_SOURCE@"
+#define MAXSCALE_CMAKE_FLAGS "@MAXSCALE_CMAKE_FLAGS@"
+#define MAXSCALE_JENKINS_BUILD_TAG "@MAXSCALE_JENKINS_BUILD_TAG@"