cassandra git commit: Follow up CASSANDRA-13072: Fix wrong merge

[bl...@apache.org]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 3e0a911b3 -> a741efd94


Follow up CASSANDRA-13072: Fix wrong merge


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

Branch: refs/heads/trunk
Commit: a741efd94558feb36baff59718553c85f4a75ba7
Parents: 3e0a911
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Jun 1 09:40:51 2017 +0200
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Jun 1 09:40:51 2017 +0200

----------------------------------------------------------------------
 lib/futures-2.1.6-py2.py3-none-any.zip | Bin 1090481 -> 0 bytes
 lib/jna-4.4.0.jar                      | Bin 0 -> 1091208 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a741efd9/lib/futures-2.1.6-py2.py3-none-any.zip
----------------------------------------------------------------------
diff --git a/lib/futures-2.1.6-py2.py3-none-any.zip b/lib/futures-2.1.6-py2.py3-none-any.zip
deleted file mode 100644
index 4c27243..0000000
Binary files a/lib/futures-2.1.6-py2.py3-none-any.zip and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a741efd9/lib/jna-4.4.0.jar
----------------------------------------------------------------------
diff --git a/lib/jna-4.4.0.jar b/lib/jna-4.4.0.jar
new file mode 100644
index 0000000..521bd92
Binary files /dev/null and b/lib/jna-4.4.0.jar differ


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org