Repository: trafficserver Updated Branches: refs/heads/master 53b1d9466 -> bf084bb24
TS-2362 - fix minor issue, fix compiler problem. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bf084bb2 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bf084bb2 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bf084bb2 Branch: refs/heads/master Commit: bf084bb24b499d08349e204ba178df005151adb9 Parents: 53b1d94 Author: Alan M. Carroll <[email protected]> Authored: Sun Aug 10 18:43:16 2014 -0500 Committer: Alan M. Carroll <[email protected]> Committed: Sun Aug 10 18:43:16 2014 -0500 ---------------------------------------------------------------------- iocore/cache/CacheWrite.cc | 1 + proxy/Main.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bf084bb2/iocore/cache/CacheWrite.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/CacheWrite.cc b/iocore/cache/CacheWrite.cc index 287b5e8..a40f825 100644 --- a/iocore/cache/CacheWrite.cc +++ b/iocore/cache/CacheWrite.cc @@ -754,6 +754,7 @@ agg_copy(char *p, CacheVC *vc) doc->doc_type = vc->frag_type; doc->v_major = CACHE_DB_MAJOR_VERSION; doc->v_minor = CACHE_DB_MINOR_VERSION; + doc->unused = 0; // force this for forward compatibility. doc->total_len = vc->total_len; doc->first_key = vc->first_key; doc->sync_serial = vol->header->sync_serial; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bf084bb2/proxy/Main.cc ---------------------------------------------------------------------- diff --git a/proxy/Main.cc b/proxy/Main.cc index 222e374..f7c8555 100644 --- a/proxy/Main.cc +++ b/proxy/Main.cc @@ -168,7 +168,7 @@ const Version version = { {CACHE_DB_MAJOR_VERSION, CACHE_DB_MINOR_VERSION}, // cacheDB {CACHE_DIR_MAJOR_VERSION, CACHE_DIR_MINOR_VERSION}, // cacheDir {CLUSTER_MAJOR_VERSION, CLUSTER_MINOR_VERSION}, // current clustering - {MIN_CLUSTER_MAJOR_VERSION, MIN_CLUSTER_MINOR_VERSION}, // min clustering + {MIN_CLUSTER_MAJOR_VERSION, MIN_CLUSTER_MINOR_VERSION} // min clustering }; static const ArgumentDescription argument_descriptions[] = {
