git commit: TS-2466: NOT increase the version of records.config with local

[zy...@apache.org]

Updated Branches:
  refs/heads/master 3344fdfc7 -> 909319c7c


TS-2466: NOT increase the version of records.config with local

we should NOT increase the version of records.config when change
the local parameter, this will prevent cluster sync of the config.

Signed-off-by: Zhao Yongming <mi...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/909319c7
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/909319c7
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/909319c7

Branch: refs/heads/master
Commit: 909319c7c9a04d946d343acb0f575b1768cd1934
Parents: 3344fdf
Author: Yu Qing <zh...@taobao.com>
Authored: Thu Jan 2 10:44:36 2014 +0800
Committer: Zhao Yongming <mi...@gmail.com>
Committed: Mon Jan 6 17:14:42 2014 +0800

----------------------------------------------------------------------
 CHANGES                  | 4 ++++
 lib/records/P_RecCore.cc | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/909319c7/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index be012eb..abccdbb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 4.2.0
 
+  *) [TS-2466] NOT increase the version of records.config when changing
+   the local parameter
+   Author: Yu Qing
+
   *) [TS-2469] remove libreadline which is gpl licensed.
    Author: Ben Aitchison <be...@meh.net.nz>
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/909319c7/lib/records/P_RecCore.cc
----------------------------------------------------------------------
diff --git a/lib/records/P_RecCore.cc b/lib/records/P_RecCore.cc
index a2127e6..6f02a20 100644
--- a/lib/records/P_RecCore.cc
+++ b/lib/records/P_RecCore.cc
@@ -670,7 +670,7 @@ RecSyncConfigToTB(textBuffer * tb, bool *inc_version)
           sync_to_disk = true;
           if (r->sync_required & REC_INC_CONFIG_VERSION) {
             r->sync_required = r->sync_required & ~REC_INC_CONFIG_VERSION;
-            if (inc_version != NULL) {
+            if (r->rec_type != RECT_LOCAL && inc_version != NULL) {
               *inc_version = true;
             }
           }