You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/07/22 18:45:44 UTC
[1/2] git commit: Tidy up formatting in CHANGES
Updated Branches:
refs/heads/master 5c0b6b98f -> c79c1c143
Tidy up formatting in CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c79c1c14
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c79c1c14
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c79c1c14
Branch: refs/heads/master
Commit: c79c1c14337e13fc282105df20406e7669d2ff55
Parents: 48cedce
Author: James Peach <jp...@apache.org>
Authored: Mon Jul 22 09:43:51 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon Jul 22 09:45:15 2013 -0700
----------------------------------------------------------------------
CHANGES | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c79c1c14/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 25eda2b..6a15460 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,7 @@ Changes with Apache Traffic Server 3.3.5
Author: bettydramit <b13621367396 at gmail dot com>
*) [TS-1943] Rename mcport and rsport parameters to make them more readable.
- uthor: Yunkai Zhang <qi...@taobao.com>
+ Author: Yunkai Zhang <qi...@taobao.com>
*) [TS-2046] Move perl contribs to lib/perl, and have make / make install
build and install the modules as appropriate.
@@ -16,7 +16,7 @@ Changes with Apache Traffic Server 3.3.5
*) [TS-2050] Cleanup ink_config.h.in, removing unused symbols.
*) [TS-1487] [TS-2035] Moved plugin init, added plugin lifecycle hooks,
- added delay listen for cache. Removed TS_NO_API defined/build option.
+ added delay listen for cache. Removed TS_NO_API defined/build option.
*) [TS-2047] Schedule RamCacheCLFUSCompressor in RamCacheCLFUS::init instead
of immediately after instantiation.
[2/2] git commit: TS-2030: build error with --enable-interim-cache on
fedora19 x86_64
Posted by jp...@apache.org.
TS-2030: build error with --enable-interim-cache on fedora19 x86_64
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/48cedceb
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/48cedceb
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/48cedceb
Branch: refs/heads/master
Commit: 48cedcebacc059bb8e9cbb8ba847dc7b6f44486d
Parents: 5c0b6b9
Author: bettydramit <b1...@gmail.com>
Authored: Mon Jul 22 09:38:36 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon Jul 22 09:45:15 2013 -0700
----------------------------------------------------------------------
CHANGES | 3 +++
iocore/cache/CacheWrite.cc | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/48cedceb/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 218af33..25eda2b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
Changes with Apache Traffic Server 3.3.5
+ *) [TS-2030] Build error with --enable-interim-cache on fedora19 x86_64.
+ Author: bettydramit <b13621367396 at gmail dot com>
+
*) [TS-1943] Rename mcport and rsport parameters to make them more readable.
uthor: Yunkai Zhang <qi...@taobao.com>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/48cedceb/iocore/cache/CacheWrite.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheWrite.cc b/iocore/cache/CacheWrite.cc
index de0b5ad..a01fe0d 100644
--- a/iocore/cache/CacheWrite.cc
+++ b/iocore/cache/CacheWrite.cc
@@ -1932,9 +1932,9 @@ InterimCacheVol::aggWriteDone(int event, void *e)
// for fragments is this aggregation buffer
Debug("cache_disk_error", "Write error on disk %s\n \
write range : [%" PRIu64 " - %" PRIu64 " bytes] [%" PRIu64 " - %" PRIu64 " blocks] \n",
- "InterimCache ID", io.aiocb.aio_offset, io.aiocb.aio_offset + io.aiocb.aio_nbytes,
- io.aiocb.aio_offset / CACHE_BLOCK_SIZE,
- (io.aiocb.aio_offset + io.aiocb.aio_nbytes) / CACHE_BLOCK_SIZE);
+ "InterimCache ID", (uint64_t)io.aiocb.aio_offset, (uint64_t)(io.aiocb.aio_offset + io.aiocb.aio_nbytes),
+ (uint64_t)io.aiocb.aio_offset / CACHE_BLOCK_SIZE,
+ (uint64_t)(io.aiocb.aio_offset + io.aiocb.aio_nbytes) / CACHE_BLOCK_SIZE);
Dir del_dir;
dir_clear(&del_dir);
dir_set_ininterim(&del_dir);