cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Date Fri, 20 Nov 2015 16:25:47 GMT
Merge branch 'cassandra-3.0' into cassandra-3.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32a682a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32a682a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32a682a5

Branch: refs/heads/cassandra-3.1
Commit: 32a682a5f26e917a8085c8407cadf91c1ca9cbe8
Parents: f3fcdd7 6ac831f
Author: Robert Stupp <snazy@snazy.de>
Authored: Fri Nov 20 17:24:50 2015 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Fri Nov 20 17:24:50 2015 +0100

----------------------------------------------------------------------
 build.xml                                       | 180 +---------
 ide/idea-iml-file.xml                           |  68 ++++
 ide/idea/inspectionProfiles/Project_Default.xml |  38 +-
 ide/idea/misc.xml                               |   4 +
 ide/idea/vcs.xml                                |   6 +
 ide/idea/workspace.xml                          | 359 +++++++++++++++++++
 6 files changed, 447 insertions(+), 208 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/32a682a5/build.xml
----------------------------------------------------------------------


Mime
View raw message