Merge branch cassandra-3.11 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea57a4db Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea57a4db Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea57a4db Branch: refs/heads/trunk Commit: ea57a4dbe8b3c312465cd2a0fe315d5f04f8ce92 Parents: 7b149ce 54ff619 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Wed May 31 14:48:48 2017 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Wed May 31 14:52:30 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- lib/futures-2.1.6-py2.py3-none-any.zip | Bin 16571 -> 1090481 bytes lib/jna-4.3.0.jar | Bin 945524 -> 0 bytes lib/licenses/jna-4.3.0.txt | 202 ---------------------------- lib/licenses/jna-4.4.0.txt | 202 ++++++++++++++++++++++++++++ 6 files changed, 204 insertions(+), 203 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea57a4db/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d81d2c5,26a8018..0bda3a6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -163,6 -93,8 +163,7 @@@ Merged from 3.0 * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410) * Fix schema version calculation for rolling upgrades (CASSANDRA-13441) Merged from 2.2: - * upgrade JNA version to 4.4.0 (CASSANDRA-13072) - * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119) ++ * Upgrade JNA to version 4.4.0 (CASSANDRA-13072) * Avoid starting gossiper in RemoveTest (CASSANDRA-13407) * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393) * Fix JVM metric names (CASSANDRA-13103) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea57a4db/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea57a4db/lib/futures-2.1.6-py2.py3-none-any.zip ---------------------------------------------------------------------- diff --cc lib/futures-2.1.6-py2.py3-none-any.zip index 50bd78b,50bd78b..4c27243 Binary files differ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
