You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2016/07/01 20:14:35 UTC
[4/4] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db613724
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db613724
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db613724
Branch: refs/heads/cassandra-3.0
Commit: db6137249837c255a687db7636471e4f7a15f53b
Parents: 6b24109 65f8bb6
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jul 1 16:14:13 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jul 1 16:14:13 2016 -0400
----------------------------------------------------------------------
lib/licenses/logback-classic-1.1.2.txt | 70 -----------------------------
lib/licenses/logback-classic-1.1.3.txt | 70 +++++++++++++++++++++++++++++
lib/licenses/logback-core-1.1.2.txt | 70 -----------------------------
lib/licenses/logback-core-1.1.3.txt | 70 +++++++++++++++++++++++++++++
4 files changed, 140 insertions(+), 140 deletions(-)
----------------------------------------------------------------------