Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76c4841b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76c4841b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76c4841b Branch: refs/heads/trunk Commit: 76c4841b34ce232e79b97a197d8198384d814fc3 Parents: 4016160 32a682a Author: Robert Stupp <[email protected]> Authored: Fri Nov 20 17:24:57 2015 +0100 Committer: Robert Stupp <[email protected]> Committed: Fri Nov 20 17:24:57 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/76c4841b/build.xml ----------------------------------------------------------------------
