You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ml...@apache.org on 2013/12/19 02:05:23 UTC

[12/12] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver


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

Branch: refs/heads/master
Commit: 90af89c47425cf55ca1a472ec68847afb2efc57a
Parents: 9e06528 0c953e1
Author: Miles Libbey <ml...@apache.org>
Authored: Wed Dec 18 17:03:02 2013 -0800
Committer: Miles Libbey <ml...@apache.org>
Committed: Wed Dec 18 17:03:02 2013 -0800

----------------------------------------------------------------------
 CHANGES                                         |   2 +-
 doc/arch/cache/cache-arch.en.rst                | 148 ++++++++++++-------
 doc/glossary.en.rst                             |  42 +++++-
 ...viewing-statistics-using-traffic-line.en.rst |   2 +-
 lib/atscppapi/src/include/atscppapi/Headers.h   |   2 +-
 5 files changed, 142 insertions(+), 54 deletions(-)
----------------------------------------------------------------------



Re: [12/12] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

Posted by Igor Galić <i....@brainsware.org>.
Please whenever possible, rebase before pushing.
Otherwise it's quite easy for reviewers to miss a commit..

----- Original Message -----
> Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/trafficserver
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
> Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/90af89c4
> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/90af89c4
> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/90af89c4
> 
> Branch: refs/heads/master
> Commit: 90af89c47425cf55ca1a472ec68847afb2efc57a
> Parents: 9e06528 0c953e1
> Author: Miles Libbey <ml...@apache.org>
> Authored: Wed Dec 18 17:03:02 2013 -0800
> Committer: Miles Libbey <ml...@apache.org>
> Committed: Wed Dec 18 17:03:02 2013 -0800
> 
> ----------------------------------------------------------------------
>  CHANGES                                         |   2 +-
>  doc/arch/cache/cache-arch.en.rst                | 148 ++++++++++++-------
>  doc/glossary.en.rst                             |  42 +++++-
>  ...viewing-statistics-using-traffic-line.en.rst |   2 +-
>  lib/atscppapi/src/include/atscppapi/Headers.h   |   2 +-
>  5 files changed, 142 insertions(+), 54 deletions(-)
> ----------------------------------------------------------------------
> 
> 
> 

-- 
Igor Galić

Tel: +43 (0) 664 886 22 883
Mail: i.galic@brainsware.org
URL: http://brainsware.org/
GPG: 8716 7A9F 989B ABD5 100F  4008 F266 55D6 2998 1641