Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13e153b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13e153b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13e153b0 Branch: refs/heads/cassandra-3.0 Commit: 13e153b090cdebd549d0d1a224c231e9fc1abbe1 Parents: f49579d fdb8c96 Author: Michael Shuler <mich...@pbandjelly.org> Authored: Thu Jun 15 14:06:17 2017 -0500 Committer: Michael Shuler <mich...@pbandjelly.org> Committed: Thu Jun 15 14:06:17 2017 -0500 ---------------------------------------------------------------------- build.properties.default | 2 +- build.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13e153b0/build.xml ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org