GitHub user quemilk opened a pull request: https://github.com/apache/cassandra/pull/86
pull aaaaaa You can merge this pull request into a Git repository by running: $ git pull https://github.com/quemilk/cassandra trunk Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cassandra/pull/86.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #86 ---- commit 1a11d5239e3e26ff5e5110f9d4198a1bbe28a514 Author: Robert Stupp <sn...@snazy.de> Date: 2015-04-29T16:53:30Z Merge branch 'cassandra-2.1' into trunk commit 1f3ab81099199457fb3bb8cea2ca29e2c136b412 Author: T Jake Luciani <j...@apache.org> Date: 2015-04-29T18:30:14Z Merge branch 'cassandra-2.1' into trunk commit 33f37f86f64a570d63c7102b11ea455ff4a4806d Author: Ariel Weisberg <ariel.weisb...@datastax.com> Date: 2015-04-29T19:14:08Z Disable memory mapping of hsperfdata files for JVM statistics Patch by Ariel Weisberg; reviewed by jmckenzie for CASSANDRA-9242 commit c57984216e3c962455895f4a6df83ac1a79c6486 Author: Brandon Williams <brandonwilli...@apache.org> Date: 2015-04-29T21:06:14Z Merge branch 'cassandra-2.1' into trunk commit cdfa9ed7e94aee9ff641152118fc1276d35299fe Author: Ariel Weisberg <ariel.weisb...@datastax.com> Date: 2015-04-29T21:48:16Z Merge branch 'cassandra-2.1' into trunk commit 3c09adec72dbdc6d27479ca7f681ee2406e21e64 Author: Dave Brosius <dbros...@mebigfatguy.com> Date: 2015-04-30T02:24:52Z don't mask(shadow) superclass fields commit 16a7fcfb78556b23bf8b9b6dae5bb9a6756b83c9 Author: Dave Brosius <dbros...@mebigfatguy.com> Date: 2015-04-30T02:39:39Z remove dead field commit 01880a470c31c6c27bb82d73727623fe253eef9f Author: Dave Brosius <dbros...@mebigfatguy.com> Date: 2015-04-30T03:25:24Z simplify duplicate catch blocks commit f85df37416db31c0b61acbeedfddbdedafc04634 Author: Marcus Eriksson <marc...@apache.org> Date: 2015-04-30T10:59:48Z Merge branch 'cassandra-2.1' into trunk commit 0656924fc5feb736f219fdf2dba2138a7a209dcd Author: Marcus Eriksson <marc...@apache.org> Date: 2015-04-30T11:06:39Z Merge branch 'cassandra-2.1' into trunk commit 90476352a56568fc47418905dd31a16eb00a7981 Author: Aleksey Yeschenko <alek...@apache.org> Date: 2015-04-30T16:04:35Z Merge branch 'cassandra-2.1' into trunk commit 774bd0bceeee56abd97a122c563852210cf54bbc Author: Josh McKenzie <josh.mcken...@datastax.com> Date: 2015-04-30T16:13:23Z Follow-up #2 for 9104. Fix SchemaLoader + EmbeddedCassandraServer recover case Patch by jmckenzie; reviewed by branimir for CASSANDRA-9104 commit 3bfe4b6ae849add1c3388db3874bbdfd27443822 Author: T Jake Luciani <j...@apache.org> Date: 2015-04-30T16:42:10Z Merge branch 'cassandra-2.1' into trunk commit 49b089893b5407ba42dad389804ff21d535a8537 Author: Tyler Hobbs <tylerlho...@gmail.com> Date: 2015-04-30T18:15:57Z Merge branch 'cassandra-2.1' into trunk commit 527c12a0115629ad0fa7ec95a24c55fc115739a1 Author: Benedict Elliott Smith <bened...@apache.org> Date: 2015-05-01T10:33:52Z Merge branch 'cassandra-2.1' into trunk commit 97d9a6b730eaf77c90dbe0b743b025a2f875f4f0 Author: Benedict Elliott Smith <bened...@apache.org> Date: 2015-05-01T10:38:42Z Merge branch 'cassandra-2.1' into trunk commit 184f5b3ad470862b6f624cd17d6f379cd2cb24fe Author: Benedict Elliott Smith <bened...@apache.org> Date: 2015-05-01T12:59:03Z revert CASSANDRA-9084 commit c799a98f0a454010cb3a63c874c404d1d2c79048 Author: Aleksey Yeschenko <alek...@apache.org> Date: 2015-05-01T16:21:04Z Merge branch 'cassandra-2.1' into trunk commit 6404e015ffe916fe24bacb3772b388e633af1261 Author: Aleksey Yeschenko <alek...@apache.org> Date: 2015-05-01T16:50:06Z Merge branch 'cassandra-2.1' into trunk commit d305ce42fc727c6251fc682fcc2168e410e33e99 Author: Yuki Morishita <yu...@apache.org> Date: 2015-05-01T19:49:01Z Merge branch 'cassandra-2.1' into trunk commit be6295edeec7dd78f5911f6dea02ce6544d0f6e7 Author: Yuki Morishita <yu...@apache.org> Date: 2015-05-01T20:59:59Z Merge branch 'cassandra-2.1' into trunk commit bbc796dfd092e01c8c42e1885819f6ba193260f9 Author: Yuki Morishita <yu...@apache.org> Date: 2015-05-01T21:56:37Z Merge branch 'cassandra-2.1' into trunk commit 00cd9b9fff711a678c37b1f93ecd8417f22c256e Author: Jim Witschey <jim.witsc...@gmail.com> Date: 2015-05-01T22:45:11Z Add tests for cqlsh's CQL parser Patch by Jim Witschey; reviewed by Tyler Hobbs for CASSANDRA-9248 commit 253ce00a64a59210b5a6bffc4999ce23921d73c5 Author: Dave Brosius <dbros...@mebigfatguy.com> Date: 2015-05-02T23:47:36Z simplify throws clauses commit 6f1e38cc2d037017b1fdfdca0fbcfc63f830577c Author: Dave Brosius <dbros...@mebigfatguy.com> Date: 2015-05-03T01:02:40Z move field to local commit 0db1431e33659392b11060451c71d006941a0dda Author: Sam Tunnicliffe <s...@beobal.com> Date: 2015-04-29T09:24:05Z Eliminate race during auth keyspace setup patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for CASSANDRA-9201 commit 6af82eddff9d2923ff5447120dac432bd0dadae4 Author: Sam Tunnicliffe <s...@beobal.com> Date: 2015-04-14T17:37:30Z DropRoleStatement should only checks su status for existing roles patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for CASSANDRA-9189 commit e28860b40135409f755b08b5e2ac70e9b27323dc Author: Aleksey Yeschenko <alek...@apache.org> Date: 2015-05-03T20:19:15Z Merge branch 'cassandra-2.1' into trunk commit d9836e0efe66c0cc0e33f32b605f6920893fa7a5 Author: Sam Tunnicliffe <s...@beobal.com> Date: 2015-05-03T21:28:16Z Fix invalidation of prepared statements on function drops patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for CASSANDRA-9166 commit 7223ec025b749b57d7610aef5e991f151d73b157 Author: Sankalp Kohli <kohlisank...@gmail.com> Date: 2015-05-04T14:58:41Z Fix threadpool in RepairSession is not shutdown on failure patch by Sankalp Kohli; reviewed by yukim for CASSANDRA-9260 ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---